virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec: Change values of codec ids at the end of lists that dont exist outside ffmpeg yet so

Browse Source 
they wont conflict when they get added to the fork with randomly changed order and values.
Also add duplicate codec_ids to allow maintaining compatibility.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-10-24 21:40:23 +02:00
parent 2179fc48b2
commit 4f587d1637
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/avcodec.h
View File

@ -212,12 +212,14 @@ enum CodecID {
CODEC_ID_WMV3IMAGE, CODEC_ID_WMV3IMAGE,
CODEC_ID_VC1IMAGE, CODEC_ID_VC1IMAGE,
#if LIBAVCODEC_VERSION_MAJOR == 53 #if LIBAVCODEC_VERSION_MAJOR == 53
CODEC_ID_8SVX_RAW, CODEC_ID_G723_1_DEPRECATED,
CODEC_ID_G2M, CODEC_ID_G729_DEPRECATED,
#endif #endif
CODEC_ID_UTVIDEO_DEPRECATED, CODEC_ID_UTVIDEO_DEPRECATED,
CODEC_ID_UTVIDEO = 0x800, CODEC_ID_UTVIDEO = 0x800,
CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'),
/* various PCM "codecs" */ /* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
CODEC_ID_PCM_S16LE= 0x10000, CODEC_ID_PCM_S16LE= 0x10000,
@ -350,11 +352,12 @@ enum CodecID {
CODEC_ID_QDMC, CODEC_ID_QDMC,
CODEC_ID_CELT, CODEC_ID_CELT,
#if LIBAVCODEC_VERSION_MAJOR > 53 #if LIBAVCODEC_VERSION_MAJOR > 53
CODEC_ID_G723_1, CODEC_ID_G723_1_DEPRECATED,
CODEC_ID_G729, CODEC_ID_G729_DEPRECATED,
#endif #endif
CODEC_ID_G729 = 0x15800, CODEC_ID_G729 = 0x15800,
CODEC_ID_G723_1= 0x15801, CODEC_ID_G723_1= 0x15801,
CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'),
/* subtitle codecs */ /* subtitle codecs */
CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
@ -367,14 +370,14 @@ enum CodecID {
CODEC_ID_HDMV_PGS_SUBTITLE, CODEC_ID_HDMV_PGS_SUBTITLE,
CODEC_ID_DVB_TELETEXT, CODEC_ID_DVB_TELETEXT,
CODEC_ID_SRT, CODEC_ID_SRT,
CODEC_ID_MICRODVD, CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'),
/* 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. CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
CODEC_ID_TTF= 0x18000, CODEC_ID_TTF= 0x18000,
CODEC_ID_BINTEXT, CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'),
CODEC_ID_XBIN, CODEC_ID_XBIN = MKBETAG('X','B','I','N'),
CODEC_ID_IDF, CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'),
CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it