* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			55 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			55 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * AIFF/AIFF-C muxer/demuxer common header
 | 
						|
 * Copyright (c) 2006  Patrick Guimond
 | 
						|
 *
 | 
						|
 * This file is part of FFmpeg.
 | 
						|
 *
 | 
						|
 * FFmpeg is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU Lesser General Public
 | 
						|
 * License as published by the Free Software Foundation; either
 | 
						|
 * version 2.1 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * FFmpeg is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * Lesser General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Lesser General Public
 | 
						|
 * License along with FFmpeg; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
						|
 */
 | 
						|
 | 
						|
/**
 | 
						|
 * @file
 | 
						|
 * common header for AIFF muxer and demuxer
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef AVFORMAT_AIFF_H
 | 
						|
#define AVFORMAT_AIFF_H
 | 
						|
 | 
						|
#include "avformat.h"
 | 
						|
#include "riff.h"
 | 
						|
 | 
						|
static const AVCodecTag ff_codec_aiff_tags[] = {
 | 
						|
    { AV_CODEC_ID_PCM_S16BE,    MKTAG('N','O','N','E') },
 | 
						|
    { AV_CODEC_ID_PCM_S8,       MKTAG('N','O','N','E') },
 | 
						|
    { AV_CODEC_ID_PCM_S24BE,    MKTAG('N','O','N','E') },
 | 
						|
    { AV_CODEC_ID_PCM_S32BE,    MKTAG('N','O','N','E') },
 | 
						|
    { AV_CODEC_ID_PCM_F32BE,    MKTAG('f','l','3','2') },
 | 
						|
    { AV_CODEC_ID_PCM_F64BE,    MKTAG('f','l','6','4') },
 | 
						|
    { AV_CODEC_ID_PCM_ALAW,     MKTAG('a','l','a','w') },
 | 
						|
    { AV_CODEC_ID_PCM_MULAW,    MKTAG('u','l','a','w') },
 | 
						|
    { AV_CODEC_ID_MACE3,        MKTAG('M','A','C','3') },
 | 
						|
    { AV_CODEC_ID_MACE6,        MKTAG('M','A','C','6') },
 | 
						|
    { AV_CODEC_ID_GSM,          MKTAG('G','S','M',' ') },
 | 
						|
    { AV_CODEC_ID_ADPCM_G726,   MKTAG('G','7','2','6') },
 | 
						|
    { AV_CODEC_ID_PCM_S16BE,    MKTAG('t','w','o','s') },
 | 
						|
    { AV_CODEC_ID_PCM_S16LE,    MKTAG('s','o','w','t') },
 | 
						|
    { AV_CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') },
 | 
						|
    { AV_CODEC_ID_QDM2,         MKTAG('Q','D','M','2') },
 | 
						|
    { AV_CODEC_ID_QCELP,        MKTAG('Q','c','l','p') },
 | 
						|
    { AV_CODEC_ID_NONE,         0 },
 | 
						|
};
 | 
						|
 | 
						|
#endif /* AVFORMAT_AIFF_H */
 |