virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: add AV prefix to codec ids.

Browse Source
This commit is contained in:
Anton Khirnov 2012-08-05 10:36:55 +02:00
parent f5d2c597e9
commit 104e10fb42
5 changed files with 698 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first: API changes, most recent first:
2012-08-xx - xxxxxxx - lavc 54.25 - avcodec.h
Rename CodecID to AVCodecID and all CODEC_ID_* to AV_CODEC_ID_*.
2012-08-03 - xxxxxxx - lavu 51.37.1 - cpu.h 2012-08-03 - xxxxxxx - lavu 51.37.1 - cpu.h
lsws 2.1.1 - swscale.h lsws 2.1.1 - swscale.h
Rename AV_CPU_FLAG_MMX2 ---> AV_CPU_FLAG_MMXEXT. Rename AV_CPU_FLAG_MMX2 ---> AV_CPU_FLAG_MMXEXT.

1
libavcodec/Makefile
View File

@ -4,6 +4,7 @@ FFLIBS = avutil
HEADERS = avcodec.h \ HEADERS = avcodec.h \
avfft.h \ avfft.h \
dxva2.h \ dxva2.h \
old_codec_ids.h \
vaapi.h \ vaapi.h \
vda.h \ vda.h \
vdpau.h \ vdpau.h \

636
libavcodec/avcodec.h
View File

@ -76,6 +76,10 @@
* @{ * @{
*/ */
#if FF_API_CODEC_ID
#include "old_codec_ids.h"
#endif
/** /**
* Identify the syntax and semantics of the bitstream. * Identify the syntax and semantics of the bitstream.
* The principle is roughly: * The principle is roughly:
@ -88,342 +92,342 @@
* 1. no value of a existing codec ID changes (that would break ABI), * 1. no value of a existing codec ID changes (that would break ABI),
* 2. it is as close as possible to similar codecs. * 2. it is as close as possible to similar codecs.
*/ */
enum CodecID { enum AVCodecID {
CODEC_ID_NONE, AV_CODEC_ID_NONE,
/* video codecs */ /* video codecs */
CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG1VIDEO,
CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
CODEC_ID_MPEG2VIDEO_XVMC, AV_CODEC_ID_MPEG2VIDEO_XVMC,
CODEC_ID_H261, AV_CODEC_ID_H261,
CODEC_ID_H263, AV_CODEC_ID_H263,
CODEC_ID_RV10, AV_CODEC_ID_RV10,
CODEC_ID_RV20, AV_CODEC_ID_RV20,
CODEC_ID_MJPEG, AV_CODEC_ID_MJPEG,
CODEC_ID_MJPEGB, AV_CODEC_ID_MJPEGB,
CODEC_ID_LJPEG, AV_CODEC_ID_LJPEG,
CODEC_ID_SP5X, AV_CODEC_ID_SP5X,
CODEC_ID_JPEGLS, AV_CODEC_ID_JPEGLS,
CODEC_ID_MPEG4, AV_CODEC_ID_MPEG4,
CODEC_ID_RAWVIDEO, AV_CODEC_ID_RAWVIDEO,
CODEC_ID_MSMPEG4V1, AV_CODEC_ID_MSMPEG4V1,
CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V2,
CODEC_ID_MSMPEG4V3, AV_CODEC_ID_MSMPEG4V3,
CODEC_ID_WMV1, AV_CODEC_ID_WMV1,
CODEC_ID_WMV2, AV_CODEC_ID_WMV2,
CODEC_ID_H263P, AV_CODEC_ID_H263P,
CODEC_ID_H263I, AV_CODEC_ID_H263I,
CODEC_ID_FLV1, AV_CODEC_ID_FLV1,
CODEC_ID_SVQ1, AV_CODEC_ID_SVQ1,
CODEC_ID_SVQ3, AV_CODEC_ID_SVQ3,
CODEC_ID_DVVIDEO, AV_CODEC_ID_DVVIDEO,
CODEC_ID_HUFFYUV, AV_CODEC_ID_HUFFYUV,
CODEC_ID_CYUV, AV_CODEC_ID_CYUV,
CODEC_ID_H264, AV_CODEC_ID_H264,
CODEC_ID_INDEO3, AV_CODEC_ID_INDEO3,
CODEC_ID_VP3, AV_CODEC_ID_VP3,
CODEC_ID_THEORA, AV_CODEC_ID_THEORA,
CODEC_ID_ASV1, AV_CODEC_ID_ASV1,
CODEC_ID_ASV2, AV_CODEC_ID_ASV2,
CODEC_ID_FFV1, AV_CODEC_ID_FFV1,
CODEC_ID_4XM, AV_CODEC_ID_4XM,
CODEC_ID_VCR1, AV_CODEC_ID_VCR1,
CODEC_ID_CLJR, AV_CODEC_ID_CLJR,
CODEC_ID_MDEC, AV_CODEC_ID_MDEC,
CODEC_ID_ROQ, AV_CODEC_ID_ROQ,
CODEC_ID_INTERPLAY_VIDEO, AV_CODEC_ID_INTERPLAY_VIDEO,
CODEC_ID_XAN_WC3, AV_CODEC_ID_XAN_WC3,
CODEC_ID_XAN_WC4, AV_CODEC_ID_XAN_WC4,
CODEC_ID_RPZA, AV_CODEC_ID_RPZA,
CODEC_ID_CINEPAK, AV_CODEC_ID_CINEPAK,
CODEC_ID_WS_VQA, AV_CODEC_ID_WS_VQA,
CODEC_ID_MSRLE, AV_CODEC_ID_MSRLE,
CODEC_ID_MSVIDEO1, AV_CODEC_ID_MSVIDEO1,
CODEC_ID_IDCIN, AV_CODEC_ID_IDCIN,
CODEC_ID_8BPS, AV_CODEC_ID_8BPS,
CODEC_ID_SMC, AV_CODEC_ID_SMC,
CODEC_ID_FLIC, AV_CODEC_ID_FLIC,
CODEC_ID_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION1,
CODEC_ID_VMDVIDEO, AV_CODEC_ID_VMDVIDEO,
CODEC_ID_MSZH, AV_CODEC_ID_MSZH,
CODEC_ID_ZLIB, AV_CODEC_ID_ZLIB,
CODEC_ID_QTRLE, AV_CODEC_ID_QTRLE,
CODEC_ID_SNOW, AV_CODEC_ID_SNOW,
CODEC_ID_TSCC, AV_CODEC_ID_TSCC,
CODEC_ID_ULTI, AV_CODEC_ID_ULTI,
CODEC_ID_QDRAW, AV_CODEC_ID_QDRAW,
CODEC_ID_VIXL, AV_CODEC_ID_VIXL,
CODEC_ID_QPEG, AV_CODEC_ID_QPEG,
CODEC_ID_PNG, AV_CODEC_ID_PNG,
CODEC_ID_PPM, AV_CODEC_ID_PPM,
CODEC_ID_PBM, AV_CODEC_ID_PBM,
CODEC_ID_PGM, AV_CODEC_ID_PGM,
CODEC_ID_PGMYUV, AV_CODEC_ID_PGMYUV,
CODEC_ID_PAM, AV_CODEC_ID_PAM,
CODEC_ID_FFVHUFF, AV_CODEC_ID_FFVHUFF,
CODEC_ID_RV30, AV_CODEC_ID_RV30,
CODEC_ID_RV40, AV_CODEC_ID_RV40,
CODEC_ID_VC1, AV_CODEC_ID_VC1,
CODEC_ID_WMV3, AV_CODEC_ID_WMV3,
CODEC_ID_LOCO, AV_CODEC_ID_LOCO,
CODEC_ID_WNV1, AV_CODEC_ID_WNV1,
CODEC_ID_AASC, AV_CODEC_ID_AASC,
CODEC_ID_INDEO2, AV_CODEC_ID_INDEO2,
CODEC_ID_FRAPS, AV_CODEC_ID_FRAPS,
CODEC_ID_TRUEMOTION2, AV_CODEC_ID_TRUEMOTION2,
CODEC_ID_BMP, AV_CODEC_ID_BMP,
CODEC_ID_CSCD, AV_CODEC_ID_CSCD,
CODEC_ID_MMVIDEO, AV_CODEC_ID_MMVIDEO,
CODEC_ID_ZMBV, AV_CODEC_ID_ZMBV,
CODEC_ID_AVS, AV_CODEC_ID_AVS,
CODEC_ID_SMACKVIDEO, AV_CODEC_ID_SMACKVIDEO,
CODEC_ID_NUV, AV_CODEC_ID_NUV,
CODEC_ID_KMVC, AV_CODEC_ID_KMVC,
CODEC_ID_FLASHSV, AV_CODEC_ID_FLASHSV,
CODEC_ID_CAVS, AV_CODEC_ID_CAVS,
CODEC_ID_JPEG2000, AV_CODEC_ID_JPEG2000,
CODEC_ID_VMNC, AV_CODEC_ID_VMNC,
CODEC_ID_VP5, AV_CODEC_ID_VP5,
CODEC_ID_VP6, AV_CODEC_ID_VP6,
CODEC_ID_VP6F, AV_CODEC_ID_VP6F,
CODEC_ID_TARGA, AV_CODEC_ID_TARGA,
CODEC_ID_DSICINVIDEO, AV_CODEC_ID_DSICINVIDEO,
CODEC_ID_TIERTEXSEQVIDEO, AV_CODEC_ID_TIERTEXSEQVIDEO,
CODEC_ID_TIFF, AV_CODEC_ID_TIFF,
CODEC_ID_GIF, AV_CODEC_ID_GIF,
CODEC_ID_DXA, AV_CODEC_ID_DXA,
CODEC_ID_DNXHD, AV_CODEC_ID_DNXHD,
CODEC_ID_THP, AV_CODEC_ID_THP,
CODEC_ID_SGI, AV_CODEC_ID_SGI,
CODEC_ID_C93, AV_CODEC_ID_C93,
CODEC_ID_BETHSOFTVID, AV_CODEC_ID_BETHSOFTVID,
CODEC_ID_PTX, AV_CODEC_ID_PTX,
CODEC_ID_TXD, AV_CODEC_ID_TXD,
CODEC_ID_VP6A, AV_CODEC_ID_VP6A,
CODEC_ID_AMV, AV_CODEC_ID_AMV,
CODEC_ID_VB, AV_CODEC_ID_VB,
CODEC_ID_PCX, AV_CODEC_ID_PCX,
CODEC_ID_SUNRAST, AV_CODEC_ID_SUNRAST,
CODEC_ID_INDEO4, AV_CODEC_ID_INDEO4,
CODEC_ID_INDEO5, AV_CODEC_ID_INDEO5,
CODEC_ID_MIMIC, AV_CODEC_ID_MIMIC,
CODEC_ID_RL2, AV_CODEC_ID_RL2,
CODEC_ID_ESCAPE124, AV_CODEC_ID_ESCAPE124,
CODEC_ID_DIRAC, AV_CODEC_ID_DIRAC,
CODEC_ID_BFI, AV_CODEC_ID_BFI,
CODEC_ID_CMV, AV_CODEC_ID_CMV,
CODEC_ID_MOTIONPIXELS, AV_CODEC_ID_MOTIONPIXELS,
CODEC_ID_TGV, AV_CODEC_ID_TGV,
CODEC_ID_TGQ, AV_CODEC_ID_TGQ,
CODEC_ID_TQI, AV_CODEC_ID_TQI,
CODEC_ID_AURA, AV_CODEC_ID_AURA,
CODEC_ID_AURA2, AV_CODEC_ID_AURA2,
CODEC_ID_V210X, AV_CODEC_ID_V210X,
CODEC_ID_TMV, AV_CODEC_ID_TMV,
CODEC_ID_V210, AV_CODEC_ID_V210,
CODEC_ID_DPX, AV_CODEC_ID_DPX,
CODEC_ID_MAD, AV_CODEC_ID_MAD,
CODEC_ID_FRWU, AV_CODEC_ID_FRWU,
CODEC_ID_FLASHSV2, AV_CODEC_ID_FLASHSV2,
CODEC_ID_CDGRAPHICS, AV_CODEC_ID_CDGRAPHICS,
CODEC_ID_R210, AV_CODEC_ID_R210,
CODEC_ID_ANM, AV_CODEC_ID_ANM,
CODEC_ID_BINKVIDEO, AV_CODEC_ID_BINKVIDEO,
CODEC_ID_IFF_ILBM, AV_CODEC_ID_IFF_ILBM,
CODEC_ID_IFF_BYTERUN1, AV_CODEC_ID_IFF_BYTERUN1,
CODEC_ID_KGV1, AV_CODEC_ID_KGV1,
CODEC_ID_YOP, AV_CODEC_ID_YOP,
CODEC_ID_VP8, AV_CODEC_ID_VP8,
CODEC_ID_PICTOR, AV_CODEC_ID_PICTOR,
CODEC_ID_ANSI, AV_CODEC_ID_ANSI,
CODEC_ID_A64_MULTI, AV_CODEC_ID_A64_MULTI,
CODEC_ID_A64_MULTI5, AV_CODEC_ID_A64_MULTI5,
CODEC_ID_R10K, AV_CODEC_ID_R10K,
CODEC_ID_MXPEG, AV_CODEC_ID_MXPEG,
CODEC_ID_LAGARITH, AV_CODEC_ID_LAGARITH,
CODEC_ID_PRORES, AV_CODEC_ID_PRORES,
CODEC_ID_JV, AV_CODEC_ID_JV,
CODEC_ID_DFA, AV_CODEC_ID_DFA,
CODEC_ID_WMV3IMAGE, AV_CODEC_ID_WMV3IMAGE,
CODEC_ID_VC1IMAGE, AV_CODEC_ID_VC1IMAGE,
CODEC_ID_UTVIDEO, AV_CODEC_ID_UTVIDEO,
CODEC_ID_BMV_VIDEO, AV_CODEC_ID_BMV_VIDEO,
CODEC_ID_VBLE, AV_CODEC_ID_VBLE,
CODEC_ID_DXTORY, AV_CODEC_ID_DXTORY,
CODEC_ID_V410, AV_CODEC_ID_V410,
CODEC_ID_XWD, AV_CODEC_ID_XWD,
CODEC_ID_CDXL, AV_CODEC_ID_CDXL,
CODEC_ID_XBM, AV_CODEC_ID_XBM,
CODEC_ID_ZEROCODEC, AV_CODEC_ID_ZEROCODEC,
CODEC_ID_MSS1, AV_CODEC_ID_MSS1,
CODEC_ID_MSA1, AV_CODEC_ID_MSA1,
CODEC_ID_TSCC2, AV_CODEC_ID_TSCC2,
CODEC_ID_MTS2, AV_CODEC_ID_MTS2,
CODEC_ID_CLLC, AV_CODEC_ID_CLLC,
/* various PCM "codecs" */ /* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
CODEC_ID_PCM_S16LE = 0x10000, AV_CODEC_ID_PCM_S16LE = 0x10000,
CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16BE,
CODEC_ID_PCM_U16LE, AV_CODEC_ID_PCM_U16LE,
CODEC_ID_PCM_U16BE, AV_CODEC_ID_PCM_U16BE,
CODEC_ID_PCM_S8, AV_CODEC_ID_PCM_S8,
CODEC_ID_PCM_U8, AV_CODEC_ID_PCM_U8,
CODEC_ID_PCM_MULAW, AV_CODEC_ID_PCM_MULAW,
CODEC_ID_PCM_ALAW, AV_CODEC_ID_PCM_ALAW,
CODEC_ID_PCM_S32LE, AV_CODEC_ID_PCM_S32LE,
CODEC_ID_PCM_S32BE, AV_CODEC_ID_PCM_S32BE,
CODEC_ID_PCM_U32LE, AV_CODEC_ID_PCM_U32LE,
CODEC_ID_PCM_U32BE, AV_CODEC_ID_PCM_U32BE,
CODEC_ID_PCM_S24LE, AV_CODEC_ID_PCM_S24LE,
CODEC_ID_PCM_S24BE, AV_CODEC_ID_PCM_S24BE,
CODEC_ID_PCM_U24LE, AV_CODEC_ID_PCM_U24LE,
CODEC_ID_PCM_U24BE, AV_CODEC_ID_PCM_U24BE,
CODEC_ID_PCM_S24DAUD, AV_CODEC_ID_PCM_S24DAUD,
CODEC_ID_PCM_ZORK, AV_CODEC_ID_PCM_ZORK,
CODEC_ID_PCM_S16LE_PLANAR, AV_CODEC_ID_PCM_S16LE_PLANAR,
CODEC_ID_PCM_DVD, AV_CODEC_ID_PCM_DVD,
CODEC_ID_PCM_F32BE, AV_CODEC_ID_PCM_F32BE,
CODEC_ID_PCM_F32LE, AV_CODEC_ID_PCM_F32LE,
CODEC_ID_PCM_F64BE, AV_CODEC_ID_PCM_F64BE,
CODEC_ID_PCM_F64LE, AV_CODEC_ID_PCM_F64LE,
CODEC_ID_PCM_BLURAY, AV_CODEC_ID_PCM_BLURAY,
CODEC_ID_PCM_LXF, AV_CODEC_ID_PCM_LXF,
CODEC_ID_S302M, AV_CODEC_ID_S302M,
CODEC_ID_PCM_S8_PLANAR, AV_CODEC_ID_PCM_S8_PLANAR,
/* various ADPCM codecs */ /* various ADPCM codecs */
CODEC_ID_ADPCM_IMA_QT = 0x11000, AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
CODEC_ID_ADPCM_IMA_WAV, AV_CODEC_ID_ADPCM_IMA_WAV,
CODEC_ID_ADPCM_IMA_DK3, AV_CODEC_ID_ADPCM_IMA_DK3,
CODEC_ID_ADPCM_IMA_DK4, AV_CODEC_ID_ADPCM_IMA_DK4,
CODEC_ID_ADPCM_IMA_WS, AV_CODEC_ID_ADPCM_IMA_WS,
CODEC_ID_ADPCM_IMA_SMJPEG, AV_CODEC_ID_ADPCM_IMA_SMJPEG,
CODEC_ID_ADPCM_MS, AV_CODEC_ID_ADPCM_MS,
CODEC_ID_ADPCM_4XM, AV_CODEC_ID_ADPCM_4XM,
CODEC_ID_ADPCM_XA, AV_CODEC_ID_ADPCM_XA,
CODEC_ID_ADPCM_ADX, AV_CODEC_ID_ADPCM_ADX,
CODEC_ID_ADPCM_EA, AV_CODEC_ID_ADPCM_EA,
CODEC_ID_ADPCM_G726, AV_CODEC_ID_ADPCM_G726,
CODEC_ID_ADPCM_CT, AV_CODEC_ID_ADPCM_CT,
CODEC_ID_ADPCM_SWF, AV_CODEC_ID_ADPCM_SWF,
CODEC_ID_ADPCM_YAMAHA, AV_CODEC_ID_ADPCM_YAMAHA,
CODEC_ID_ADPCM_SBPRO_4, AV_CODEC_ID_ADPCM_SBPRO_4,
CODEC_ID_ADPCM_SBPRO_3, AV_CODEC_ID_ADPCM_SBPRO_3,
CODEC_ID_ADPCM_SBPRO_2, AV_CODEC_ID_ADPCM_SBPRO_2,
CODEC_ID_ADPCM_THP, AV_CODEC_ID_ADPCM_THP,
CODEC_ID_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV,
CODEC_ID_ADPCM_EA_R1, AV_CODEC_ID_ADPCM_EA_R1,
CODEC_ID_ADPCM_EA_R3, AV_CODEC_ID_ADPCM_EA_R3,
CODEC_ID_ADPCM_EA_R2, AV_CODEC_ID_ADPCM_EA_R2,
CODEC_ID_ADPCM_IMA_EA_SEAD, AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
CODEC_ID_ADPCM_IMA_EA_EACS, AV_CODEC_ID_ADPCM_IMA_EA_EACS,
CODEC_ID_ADPCM_EA_XAS, AV_CODEC_ID_ADPCM_EA_XAS,
CODEC_ID_ADPCM_EA_MAXIS_XA, AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
CODEC_ID_ADPCM_IMA_ISS, AV_CODEC_ID_ADPCM_IMA_ISS,
CODEC_ID_ADPCM_G722, AV_CODEC_ID_ADPCM_G722,
CODEC_ID_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_IMA_APC,
/* AMR */ /* AMR */
CODEC_ID_AMR_NB = 0x12000, AV_CODEC_ID_AMR_NB = 0x12000,
CODEC_ID_AMR_WB, AV_CODEC_ID_AMR_WB,
/* RealAudio codecs*/ /* RealAudio codecs*/
CODEC_ID_RA_144 = 0x13000, AV_CODEC_ID_RA_144 = 0x13000,
CODEC_ID_RA_288, AV_CODEC_ID_RA_288,
/* various DPCM codecs */ /* various DPCM codecs */
CODEC_ID_ROQ_DPCM = 0x14000, AV_CODEC_ID_ROQ_DPCM = 0x14000,
CODEC_ID_INTERPLAY_DPCM, AV_CODEC_ID_INTERPLAY_DPCM,
CODEC_ID_XAN_DPCM, AV_CODEC_ID_XAN_DPCM,
CODEC_ID_SOL_DPCM, AV_CODEC_ID_SOL_DPCM,
/* audio codecs */ /* audio codecs */
CODEC_ID_MP2 = 0x15000, AV_CODEC_ID_MP2 = 0x15000,
CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
CODEC_ID_AAC, AV_CODEC_ID_AAC,
CODEC_ID_AC3, AV_CODEC_ID_AC3,
CODEC_ID_DTS, AV_CODEC_ID_DTS,
CODEC_ID_VORBIS, AV_CODEC_ID_VORBIS,
CODEC_ID_DVAUDIO, AV_CODEC_ID_DVAUDIO,
CODEC_ID_WMAV1, AV_CODEC_ID_WMAV1,
CODEC_ID_WMAV2, AV_CODEC_ID_WMAV2,
CODEC_ID_MACE3, AV_CODEC_ID_MACE3,
CODEC_ID_MACE6, AV_CODEC_ID_MACE6,
CODEC_ID_VMDAUDIO, AV_CODEC_ID_VMDAUDIO,
CODEC_ID_FLAC, AV_CODEC_ID_FLAC,
CODEC_ID_MP3ADU, AV_CODEC_ID_MP3ADU,
CODEC_ID_MP3ON4, AV_CODEC_ID_MP3ON4,
CODEC_ID_SHORTEN, AV_CODEC_ID_SHORTEN,
CODEC_ID_ALAC, AV_CODEC_ID_ALAC,
CODEC_ID_WESTWOOD_SND1, AV_CODEC_ID_WESTWOOD_SND1,
CODEC_ID_GSM, ///< as in Berlin toast format AV_CODEC_ID_GSM, ///< as in Berlin toast format
CODEC_ID_QDM2, AV_CODEC_ID_QDM2,
CODEC_ID_COOK, AV_CODEC_ID_COOK,
CODEC_ID_TRUESPEECH, AV_CODEC_ID_TRUESPEECH,
CODEC_ID_TTA, AV_CODEC_ID_TTA,
CODEC_ID_SMACKAUDIO, AV_CODEC_ID_SMACKAUDIO,
CODEC_ID_QCELP, AV_CODEC_ID_QCELP,
CODEC_ID_WAVPACK, AV_CODEC_ID_WAVPACK,
CODEC_ID_DSICINAUDIO, AV_CODEC_ID_DSICINAUDIO,
CODEC_ID_IMC, AV_CODEC_ID_IMC,
CODEC_ID_MUSEPACK7, AV_CODEC_ID_MUSEPACK7,
CODEC_ID_MLP, AV_CODEC_ID_MLP,
CODEC_ID_GSM_MS, /* as found in WAV */ AV_CODEC_ID_GSM_MS, /* as found in WAV */
CODEC_ID_ATRAC3, AV_CODEC_ID_ATRAC3,
CODEC_ID_VOXWARE, AV_CODEC_ID_VOXWARE,
CODEC_ID_APE, AV_CODEC_ID_APE,
CODEC_ID_NELLYMOSER, AV_CODEC_ID_NELLYMOSER,
CODEC_ID_MUSEPACK8, AV_CODEC_ID_MUSEPACK8,
CODEC_ID_SPEEX, AV_CODEC_ID_SPEEX,
CODEC_ID_WMAVOICE, AV_CODEC_ID_WMAVOICE,
CODEC_ID_WMAPRO, AV_CODEC_ID_WMAPRO,
CODEC_ID_WMALOSSLESS, AV_CODEC_ID_WMALOSSLESS,
CODEC_ID_ATRAC3P, AV_CODEC_ID_ATRAC3P,
CODEC_ID_EAC3, AV_CODEC_ID_EAC3,
CODEC_ID_SIPR, AV_CODEC_ID_SIPR,
CODEC_ID_MP1, AV_CODEC_ID_MP1,
CODEC_ID_TWINVQ, AV_CODEC_ID_TWINVQ,
CODEC_ID_TRUEHD, AV_CODEC_ID_TRUEHD,
CODEC_ID_MP4ALS, AV_CODEC_ID_MP4ALS,
CODEC_ID_ATRAC1, AV_CODEC_ID_ATRAC1,
CODEC_ID_BINKAUDIO_RDFT, AV_CODEC_ID_BINKAUDIO_RDFT,
CODEC_ID_BINKAUDIO_DCT, AV_CODEC_ID_BINKAUDIO_DCT,
CODEC_ID_AAC_LATM, AV_CODEC_ID_AAC_LATM,
CODEC_ID_QDMC, AV_CODEC_ID_QDMC,
CODEC_ID_CELT, AV_CODEC_ID_CELT,
CODEC_ID_G723_1, AV_CODEC_ID_G723_1,
CODEC_ID_G729, AV_CODEC_ID_G729,
CODEC_ID_8SVX_EXP, AV_CODEC_ID_8SVX_EXP,
CODEC_ID_8SVX_FIB, AV_CODEC_ID_8SVX_FIB,
CODEC_ID_BMV_AUDIO, AV_CODEC_ID_BMV_AUDIO,
CODEC_ID_RALF, AV_CODEC_ID_RALF,
CODEC_ID_IAC, AV_CODEC_ID_IAC,
CODEC_ID_ILBC, AV_CODEC_ID_ILBC,
/* subtitle codecs */ /* subtitle codecs */
CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
CODEC_ID_DVD_SUBTITLE = 0x17000, AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
CODEC_ID_DVB_SUBTITLE, AV_CODEC_ID_DVB_SUBTITLE,
CODEC_ID_TEXT, ///< raw UTF-8 text AV_CODEC_ID_TEXT, ///< raw UTF-8 text
CODEC_ID_XSUB, AV_CODEC_ID_XSUB,
CODEC_ID_SSA, AV_CODEC_ID_SSA,
CODEC_ID_MOV_TEXT, AV_CODEC_ID_MOV_TEXT,
CODEC_ID_HDMV_PGS_SUBTITLE, AV_CODEC_ID_HDMV_PGS_SUBTITLE,
CODEC_ID_DVB_TELETEXT, AV_CODEC_ID_DVB_TELETEXT,
CODEC_ID_SRT, AV_CODEC_ID_SRT,
/* other specific kind of codecs (generally used for attachments) */ /* other specific kind of codecs (generally used for attachments) */
CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
CODEC_ID_TTF = 0x18000, AV_CODEC_ID_TTF = 0x18000,
CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
* stream (only used by libavformat) */ * stream (only used by libavformat) */
CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
* stream (only used by libavformat) */ * stream (only used by libavformat) */
CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
}; };
#if FF_API_OLD_DECODE_AUDIO #if FF_API_OLD_DECODE_AUDIO
@ -1261,7 +1265,7 @@ typedef struct AVCodecContext {
enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
struct AVCodec *codec; struct AVCodec *codec;
char codec_name[32]; char codec_name[32];
enum CodecID codec_id; /* see CODEC_ID_xxx */ enum CodecID codec_id; /* see AV_CODEC_ID_xxx */
/** /**
* fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
@ -3228,7 +3232,7 @@ void avcodec_get_frame_defaults(AVFrame *pic);
* @code * @code
* avcodec_register_all(); * avcodec_register_all();
* av_dict_set(&opts, "b", "2.5M", 0); * av_dict_set(&opts, "b", "2.5M", 0);
* codec = avcodec_find_decoder(CODEC_ID_H264); * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
* if (!codec) * if (!codec)
* exit(1); * exit(1);
* *

370
libavcodec/old_codec_ids.h Normal file
View File

@ -0,0 +1,370 @@
/*
* This file is part of Libav.
*
* Libav 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.
*
* Libav 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 Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_OLD_CODEC_IDS_H
#define AVCODEC_OLD_CODEC_IDS_H
#include "libavutil/attributes.h"
/*
* This header exists to prevent new codec IDs from being accidentally added to
* the deprecated list.
* Do not include it directly. It will be removed on next major bump
*
* Do not add new items to this list. Use the AVCodecID enum instead.
*/
enum CodecID {
CODEC_ID_NONE,
/* video codecs */
CODEC_ID_MPEG1VIDEO,
CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
CODEC_ID_MPEG2VIDEO_XVMC,
CODEC_ID_H261,
CODEC_ID_H263,
CODEC_ID_RV10,
CODEC_ID_RV20,
CODEC_ID_MJPEG,
CODEC_ID_MJPEGB,
CODEC_ID_LJPEG,
CODEC_ID_SP5X,
CODEC_ID_JPEGLS,
CODEC_ID_MPEG4,
CODEC_ID_RAWVIDEO,
CODEC_ID_MSMPEG4V1,
CODEC_ID_MSMPEG4V2,
CODEC_ID_MSMPEG4V3,
CODEC_ID_WMV1,
CODEC_ID_WMV2,
CODEC_ID_H263P,
CODEC_ID_H263I,
CODEC_ID_FLV1,
CODEC_ID_SVQ1,
CODEC_ID_SVQ3,
CODEC_ID_DVVIDEO,
CODEC_ID_HUFFYUV,
CODEC_ID_CYUV,
CODEC_ID_H264,
CODEC_ID_INDEO3,
CODEC_ID_VP3,
CODEC_ID_THEORA,
CODEC_ID_ASV1,
CODEC_ID_ASV2,
CODEC_ID_FFV1,
CODEC_ID_4XM,
CODEC_ID_VCR1,
CODEC_ID_CLJR,
CODEC_ID_MDEC,
CODEC_ID_ROQ,
CODEC_ID_INTERPLAY_VIDEO,
CODEC_ID_XAN_WC3,
CODEC_ID_XAN_WC4,
CODEC_ID_RPZA,
CODEC_ID_CINEPAK,
CODEC_ID_WS_VQA,
CODEC_ID_MSRLE,
CODEC_ID_MSVIDEO1,
CODEC_ID_IDCIN,
CODEC_ID_8BPS,
CODEC_ID_SMC,
CODEC_ID_FLIC,
CODEC_ID_TRUEMOTION1,
CODEC_ID_VMDVIDEO,
CODEC_ID_MSZH,
CODEC_ID_ZLIB,
CODEC_ID_QTRLE,
CODEC_ID_SNOW,
CODEC_ID_TSCC,
CODEC_ID_ULTI,
CODEC_ID_QDRAW,
CODEC_ID_VIXL,
CODEC_ID_QPEG,
CODEC_ID_PNG,
CODEC_ID_PPM,
CODEC_ID_PBM,
CODEC_ID_PGM,
CODEC_ID_PGMYUV,
CODEC_ID_PAM,
CODEC_ID_FFVHUFF,
CODEC_ID_RV30,
CODEC_ID_RV40,
CODEC_ID_VC1,
CODEC_ID_WMV3,
CODEC_ID_LOCO,
CODEC_ID_WNV1,
CODEC_ID_AASC,
CODEC_ID_INDEO2,
CODEC_ID_FRAPS,
CODEC_ID_TRUEMOTION2,
CODEC_ID_BMP,
CODEC_ID_CSCD,
CODEC_ID_MMVIDEO,
CODEC_ID_ZMBV,
CODEC_ID_AVS,
CODEC_ID_SMACKVIDEO,
CODEC_ID_NUV,
CODEC_ID_KMVC,
CODEC_ID_FLASHSV,
CODEC_ID_CAVS,
CODEC_ID_JPEG2000,
CODEC_ID_VMNC,
CODEC_ID_VP5,
CODEC_ID_VP6,
CODEC_ID_VP6F,
CODEC_ID_TARGA,
CODEC_ID_DSICINVIDEO,
CODEC_ID_TIERTEXSEQVIDEO,
CODEC_ID_TIFF,
CODEC_ID_GIF,
CODEC_ID_DXA,
CODEC_ID_DNXHD,
CODEC_ID_THP,
CODEC_ID_SGI,
CODEC_ID_C93,
CODEC_ID_BETHSOFTVID,
CODEC_ID_PTX,
CODEC_ID_TXD,
CODEC_ID_VP6A,
CODEC_ID_AMV,
CODEC_ID_VB,
CODEC_ID_PCX,
CODEC_ID_SUNRAST,
CODEC_ID_INDEO4,
CODEC_ID_INDEO5,
CODEC_ID_MIMIC,
CODEC_ID_RL2,
CODEC_ID_ESCAPE124,
CODEC_ID_DIRAC,
CODEC_ID_BFI,
CODEC_ID_CMV,
CODEC_ID_MOTIONPIXELS,
CODEC_ID_TGV,
CODEC_ID_TGQ,
CODEC_ID_TQI,
CODEC_ID_AURA,
CODEC_ID_AURA2,
CODEC_ID_V210X,
CODEC_ID_TMV,
CODEC_ID_V210,
CODEC_ID_DPX,
CODEC_ID_MAD,
CODEC_ID_FRWU,
CODEC_ID_FLASHSV2,
CODEC_ID_CDGRAPHICS,
CODEC_ID_R210,
CODEC_ID_ANM,
CODEC_ID_BINKVIDEO,
CODEC_ID_IFF_ILBM,
CODEC_ID_IFF_BYTERUN1,
CODEC_ID_KGV1,
CODEC_ID_YOP,
CODEC_ID_VP8,
CODEC_ID_PICTOR,
CODEC_ID_ANSI,
CODEC_ID_A64_MULTI,
CODEC_ID_A64_MULTI5,
CODEC_ID_R10K,
CODEC_ID_MXPEG,
CODEC_ID_LAGARITH,
CODEC_ID_PRORES,
CODEC_ID_JV,
CODEC_ID_DFA,
CODEC_ID_WMV3IMAGE,
CODEC_ID_VC1IMAGE,
CODEC_ID_UTVIDEO,
CODEC_ID_BMV_VIDEO,
CODEC_ID_VBLE,
CODEC_ID_DXTORY,
CODEC_ID_V410,
CODEC_ID_XWD,
CODEC_ID_CDXL,
CODEC_ID_XBM,
CODEC_ID_ZEROCODEC,
CODEC_ID_MSS1,
CODEC_ID_MSA1,
CODEC_ID_TSCC2,
CODEC_ID_MTS2,
CODEC_ID_CLLC,
/* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
CODEC_ID_PCM_S16LE = 0x10000,
CODEC_ID_PCM_S16BE,
CODEC_ID_PCM_U16LE,
CODEC_ID_PCM_U16BE,
CODEC_ID_PCM_S8,
CODEC_ID_PCM_U8,
CODEC_ID_PCM_MULAW,
CODEC_ID_PCM_ALAW,
CODEC_ID_PCM_S32LE,
CODEC_ID_PCM_S32BE,
CODEC_ID_PCM_U32LE,
CODEC_ID_PCM_U32BE,
CODEC_ID_PCM_S24LE,
CODEC_ID_PCM_S24BE,
CODEC_ID_PCM_U24LE,
CODEC_ID_PCM_U24BE,
CODEC_ID_PCM_S24DAUD,
CODEC_ID_PCM_ZORK,
CODEC_ID_PCM_S16LE_PLANAR,
CODEC_ID_PCM_DVD,
CODEC_ID_PCM_F32BE,
CODEC_ID_PCM_F32LE,
CODEC_ID_PCM_F64BE,
CODEC_ID_PCM_F64LE,
CODEC_ID_PCM_BLURAY,
CODEC_ID_PCM_LXF,
CODEC_ID_S302M,
CODEC_ID_PCM_S8_PLANAR,
/* various ADPCM codecs */
CODEC_ID_ADPCM_IMA_QT = 0x11000,
CODEC_ID_ADPCM_IMA_WAV,
CODEC_ID_ADPCM_IMA_DK3,
CODEC_ID_ADPCM_IMA_DK4,
CODEC_ID_ADPCM_IMA_WS,
CODEC_ID_ADPCM_IMA_SMJPEG,
CODEC_ID_ADPCM_MS,
CODEC_ID_ADPCM_4XM,
CODEC_ID_ADPCM_XA,
CODEC_ID_ADPCM_ADX,
CODEC_ID_ADPCM_EA,
CODEC_ID_ADPCM_G726,
CODEC_ID_ADPCM_CT,
CODEC_ID_ADPCM_SWF,
CODEC_ID_ADPCM_YAMAHA,
CODEC_ID_ADPCM_SBPRO_4,
CODEC_ID_ADPCM_SBPRO_3,
CODEC_ID_ADPCM_SBPRO_2,
CODEC_ID_ADPCM_THP,
CODEC_ID_ADPCM_IMA_AMV,
CODEC_ID_ADPCM_EA_R1,
CODEC_ID_ADPCM_EA_R3,
CODEC_ID_ADPCM_EA_R2,
CODEC_ID_ADPCM_IMA_EA_SEAD,
CODEC_ID_ADPCM_IMA_EA_EACS,
CODEC_ID_ADPCM_EA_XAS,
CODEC_ID_ADPCM_EA_MAXIS_XA,
CODEC_ID_ADPCM_IMA_ISS,
CODEC_ID_ADPCM_G722,
CODEC_ID_ADPCM_IMA_APC,
/* AMR */
CODEC_ID_AMR_NB = 0x12000,
CODEC_ID_AMR_WB,
/* RealAudio codecs*/
CODEC_ID_RA_144 = 0x13000,
CODEC_ID_RA_288,
/* various DPCM codecs */
CODEC_ID_ROQ_DPCM = 0x14000,
CODEC_ID_INTERPLAY_DPCM,
CODEC_ID_XAN_DPCM,
CODEC_ID_SOL_DPCM,
/* audio codecs */
CODEC_ID_MP2 = 0x15000,
CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
CODEC_ID_AAC,
CODEC_ID_AC3,
CODEC_ID_DTS,
CODEC_ID_VORBIS,
CODEC_ID_DVAUDIO,
CODEC_ID_WMAV1,
CODEC_ID_WMAV2,
CODEC_ID_MACE3,
CODEC_ID_MACE6,
CODEC_ID_VMDAUDIO,
CODEC_ID_FLAC,
CODEC_ID_MP3ADU,
CODEC_ID_MP3ON4,
CODEC_ID_SHORTEN,
CODEC_ID_ALAC,
CODEC_ID_WESTWOOD_SND1,
CODEC_ID_GSM, ///< as in Berlin toast format
CODEC_ID_QDM2,
CODEC_ID_COOK,
CODEC_ID_TRUESPEECH,
CODEC_ID_TTA,
CODEC_ID_SMACKAUDIO,
CODEC_ID_QCELP,
CODEC_ID_WAVPACK,
CODEC_ID_DSICINAUDIO,
CODEC_ID_IMC,
CODEC_ID_MUSEPACK7,
CODEC_ID_MLP,
CODEC_ID_GSM_MS, /* as found in WAV */
CODEC_ID_ATRAC3,
CODEC_ID_VOXWARE,
CODEC_ID_APE,
CODEC_ID_NELLYMOSER,
CODEC_ID_MUSEPACK8,
CODEC_ID_SPEEX,
CODEC_ID_WMAVOICE,
CODEC_ID_WMAPRO,
CODEC_ID_WMALOSSLESS,
CODEC_ID_ATRAC3P,
CODEC_ID_EAC3,
CODEC_ID_SIPR,
CODEC_ID_MP1,
CODEC_ID_TWINVQ,
CODEC_ID_TRUEHD,
CODEC_ID_MP4ALS,
CODEC_ID_ATRAC1,
CODEC_ID_BINKAUDIO_RDFT,
CODEC_ID_BINKAUDIO_DCT,
CODEC_ID_AAC_LATM,
CODEC_ID_QDMC,
CODEC_ID_CELT,
CODEC_ID_G723_1,
CODEC_ID_G729,
CODEC_ID_8SVX_EXP,
CODEC_ID_8SVX_FIB,
CODEC_ID_BMV_AUDIO,
CODEC_ID_RALF,
CODEC_ID_IAC,
CODEC_ID_ILBC,
/* subtitle codecs */
CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
CODEC_ID_DVD_SUBTITLE = 0x17000,
CODEC_ID_DVB_SUBTITLE,
CODEC_ID_TEXT, ///< raw UTF-8 text
CODEC_ID_XSUB,
CODEC_ID_SSA,
CODEC_ID_MOV_TEXT,
CODEC_ID_HDMV_PGS_SUBTITLE,
CODEC_ID_DVB_TELETEXT,
CODEC_ID_SRT,
/* other specific kind of codecs (generally used for attachments) */
CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
CODEC_ID_TTF = 0x18000,
CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
* stream (only used by libavformat) */
CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
* stream (only used by libavformat) */
CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
} attribute_deprecated;
#endif /* AVCODEC_OLD_CODEC_IDS_H */

5
libavcodec/version.h
View File

@ -27,7 +27,7 @@
*/ */
#define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 24 #define LIBAVCODEC_VERSION_MINOR 25
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@ -76,5 +76,8 @@
#ifndef FF_API_FIND_BEST_PIX_FMT #ifndef FF_API_FIND_BEST_PIX_FMT
#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55) #define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55)
#endif #endif
#ifndef FF_API_CODEC_ID
#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 55)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */