Commit 83c6a880 authored by James Almer's avatar James Almer

avcodec: remove fourcc values from AVCodecIDs

Based on a patch by wm4.
Reviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
Reviewed-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 2bef340c
...@@ -93,8 +93,7 @@ ...@@ -93,8 +93,7 @@
* *
* If you add a codec ID to this list, add it so that * If you add a codec ID to this list, add it so that
* 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. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec. * 2. it is as close as possible to similar codecs
* This ensures that 2 forks can independently add AVCodecIDs without producing conflicts.
* *
* After adding new codec IDs, do not forget to add an entry to the codec * After adding new codec IDs, do not forget to add an entry to the codec
* descriptor list and bump libavcodec minor version. * descriptor list and bump libavcodec minor version.
...@@ -298,22 +297,21 @@ enum AVCodecID { ...@@ -298,22 +297,21 @@ enum AVCodecID {
AV_CODEC_ID_DDS, AV_CODEC_ID_DDS,
AV_CODEC_ID_DXV, AV_CODEC_ID_DXV,
AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), AV_CODEC_ID_Y41P = 0x8000,
AV_CODEC_ID_AVRP = MKBETAG('A','V','R','P'), AV_CODEC_ID_AVRP,
AV_CODEC_ID_012V,
AV_CODEC_ID_012V = MKBETAG('0','1','2','V'), AV_CODEC_ID_AVUI,
AV_CODEC_ID_AVUI = MKBETAG('A','V','U','I'), AV_CODEC_ID_AYUV,
AV_CODEC_ID_AYUV = MKBETAG('A','Y','U','V'), AV_CODEC_ID_TARGA_Y216,
AV_CODEC_ID_TARGA_Y216 = MKBETAG('T','2','1','6'), AV_CODEC_ID_V308,
AV_CODEC_ID_V308 = MKBETAG('V','3','0','8'), AV_CODEC_ID_V408,
AV_CODEC_ID_V408 = MKBETAG('V','4','0','8'), AV_CODEC_ID_YUV4,
AV_CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'), AV_CODEC_ID_AVRN,
AV_CODEC_ID_AVRN = MKBETAG('A','V','R','n'), AV_CODEC_ID_CPIA,
AV_CODEC_ID_CPIA = MKBETAG('C','P','I','A'), AV_CODEC_ID_XFACE,
AV_CODEC_ID_XFACE = MKBETAG('X','F','A','C'), AV_CODEC_ID_SNOW,
AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'), AV_CODEC_ID_SMVJPEG,
AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'), AV_CODEC_ID_APNG,
AV_CODEC_ID_APNG = MKBETAG('A','P','N','G'),
/* various PCM "codecs" */ /* various PCM "codecs" */
AV_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
...@@ -348,6 +346,9 @@ enum AVCodecID { ...@@ -348,6 +346,9 @@ enum AVCodecID {
AV_CODEC_ID_PCM_S24LE_PLANAR, AV_CODEC_ID_PCM_S24LE_PLANAR,
AV_CODEC_ID_PCM_S32LE_PLANAR, AV_CODEC_ID_PCM_S32LE_PLANAR,
AV_CODEC_ID_PCM_S16BE_PLANAR, AV_CODEC_ID_PCM_S16BE_PLANAR,
/* new PCM "codecs" should be added right below this line starting with
* an explicit value of for example 0x10800
*/
/* various ADPCM codecs */ /* various ADPCM codecs */
AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
...@@ -384,12 +385,13 @@ enum AVCodecID { ...@@ -384,12 +385,13 @@ enum AVCodecID {
#if FF_API_VIMA_DECODER #if FF_API_VIMA_DECODER
AV_CODEC_ID_VIMA = AV_CODEC_ID_ADPCM_VIMA, AV_CODEC_ID_VIMA = AV_CODEC_ID_ADPCM_VIMA,
#endif #endif
AV_CODEC_ID_ADPCM_AFC = MKBETAG('A','F','C',' '),
AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '), AV_CODEC_ID_ADPCM_AFC = 0x11800,
AV_CODEC_ID_ADPCM_DTK = MKBETAG('D','T','K',' '), AV_CODEC_ID_ADPCM_IMA_OKI,
AV_CODEC_ID_ADPCM_IMA_RAD = MKBETAG('R','A','D',' '), AV_CODEC_ID_ADPCM_DTK,
AV_CODEC_ID_ADPCM_G726LE = MKBETAG('6','2','7','G'), AV_CODEC_ID_ADPCM_IMA_RAD,
AV_CODEC_ID_ADPCM_THP_LE = MKBETAG('T','H','P','L'), AV_CODEC_ID_ADPCM_G726LE,
AV_CODEC_ID_ADPCM_THP_LE,
/* AMR */ /* AMR */
AV_CODEC_ID_AMR_NB = 0x12000, AV_CODEC_ID_AMR_NB = 0x12000,
...@@ -476,16 +478,17 @@ enum AVCodecID { ...@@ -476,16 +478,17 @@ enum AVCodecID {
AV_CODEC_ID_PAF_AUDIO, AV_CODEC_ID_PAF_AUDIO,
AV_CODEC_ID_ON2AVC, AV_CODEC_ID_ON2AVC,
AV_CODEC_ID_DSS_SP, AV_CODEC_ID_DSS_SP,
AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'), AV_CODEC_ID_FFWAVESYNTH = 0x15800,
AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'), AV_CODEC_ID_SONIC,
AV_CODEC_ID_EVRC = MKBETAG('s','e','v','c'), AV_CODEC_ID_SONIC_LS,
AV_CODEC_ID_SMV = MKBETAG('s','s','m','v'), AV_CODEC_ID_EVRC,
AV_CODEC_ID_DSD_LSBF = MKBETAG('D','S','D','L'), AV_CODEC_ID_SMV,
AV_CODEC_ID_DSD_MSBF = MKBETAG('D','S','D','M'), AV_CODEC_ID_DSD_LSBF,
AV_CODEC_ID_DSD_LSBF_PLANAR = MKBETAG('D','S','D','1'), AV_CODEC_ID_DSD_MSBF,
AV_CODEC_ID_DSD_MSBF_PLANAR = MKBETAG('D','S','D','8'), AV_CODEC_ID_DSD_LSBF_PLANAR,
AV_CODEC_ID_4GV = MKBETAG('s','4','g','v'), AV_CODEC_ID_DSD_MSBF_PLANAR,
AV_CODEC_ID_4GV,
/* subtitle codecs */ /* subtitle codecs */
AV_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.
...@@ -498,33 +501,35 @@ enum AVCodecID { ...@@ -498,33 +501,35 @@ enum AVCodecID {
AV_CODEC_ID_HDMV_PGS_SUBTITLE, AV_CODEC_ID_HDMV_PGS_SUBTITLE,
AV_CODEC_ID_DVB_TELETEXT, AV_CODEC_ID_DVB_TELETEXT,
AV_CODEC_ID_SRT, AV_CODEC_ID_SRT,
AV_CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'),
AV_CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'), AV_CODEC_ID_MICRODVD = 0x17800,
AV_CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'), AV_CODEC_ID_EIA_608,
AV_CODEC_ID_SAMI = MKBETAG('S','A','M','I'), AV_CODEC_ID_JACOSUB,
AV_CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'), AV_CODEC_ID_SAMI,
AV_CODEC_ID_STL = MKBETAG('S','p','T','L'), AV_CODEC_ID_REALTEXT,
AV_CODEC_ID_SUBVIEWER1 = MKBETAG('S','b','V','1'), AV_CODEC_ID_STL,
AV_CODEC_ID_SUBVIEWER = MKBETAG('S','u','b','V'), AV_CODEC_ID_SUBVIEWER1,
AV_CODEC_ID_SUBRIP = MKBETAG('S','R','i','p'), AV_CODEC_ID_SUBVIEWER,
AV_CODEC_ID_WEBVTT = MKBETAG('W','V','T','T'), AV_CODEC_ID_SUBRIP,
AV_CODEC_ID_MPL2 = MKBETAG('M','P','L','2'), AV_CODEC_ID_WEBVTT,
AV_CODEC_ID_VPLAYER = MKBETAG('V','P','l','r'), AV_CODEC_ID_MPL2,
AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'), AV_CODEC_ID_VPLAYER,
AV_CODEC_ID_ASS = MKBETAG('A','S','S',' '), ///< ASS as defined in Matroska AV_CODEC_ID_PJS,
AV_CODEC_ID_HDMV_TEXT_SUBTITLE = MKBETAG('B','D','T','X'), AV_CODEC_ID_ASS,
AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
/* other specific kind of codecs (generally used for attachments) */ /* other specific kind of codecs (generally used for attachments) */
AV_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.
AV_CODEC_ID_TTF = 0x18000, AV_CODEC_ID_TTF = 0x18000,
AV_CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'),
AV_CODEC_ID_XBIN = MKBETAG('X','B','I','N'), AV_CODEC_ID_BINTEXT = 0x18800,
AV_CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'), AV_CODEC_ID_XBIN,
AV_CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'), AV_CODEC_ID_IDF,
AV_CODEC_ID_SMPTE_KLV = MKBETAG('K','L','V','A'), AV_CODEC_ID_OTF,
AV_CODEC_ID_DVD_NAV = MKBETAG('D','N','A','V'), AV_CODEC_ID_SMPTE_KLV,
AV_CODEC_ID_TIMED_ID3 = MKBETAG('T','I','D','3'), AV_CODEC_ID_DVD_NAV,
AV_CODEC_ID_BIN_DATA = MKBETAG('D','A','T','A'), AV_CODEC_ID_TIMED_ID3,
AV_CODEC_ID_BIN_DATA,
AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment