RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec.h: Move G.729/G.723 CODEC_IDs to the correct section. 

This is done conditional to the libavcodec version to avoid ABI breaks.
This commit is contained in:
Diego Biurrun 2011-10-19 23:12:56 +02:00
parent 26af0953c0
commit 463ea05ab2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/avcodec.h
View File

@ -210,8 +210,10 @@ enum CodecID {
CODEC_ID_DFA, CODEC_ID_DFA,
CODEC_ID_WMV3IMAGE, CODEC_ID_WMV3IMAGE,
CODEC_ID_VC1IMAGE, CODEC_ID_VC1IMAGE,
#if LIBAVCODEC_VERSION_MAJOR == 53
CODEC_ID_G723_1, CODEC_ID_G723_1,
CODEC_ID_G729, CODEC_ID_G729,
#endif
CODEC_ID_UTVIDEO, CODEC_ID_UTVIDEO,
/* various PCM "codecs" */ /* various PCM "codecs" */
@ -345,6 +347,10 @@ enum CodecID {
CODEC_ID_AAC_LATM, CODEC_ID_AAC_LATM,
CODEC_ID_QDMC, CODEC_ID_QDMC,
CODEC_ID_CELT, CODEC_ID_CELT,
#if LIBAVCODEC_VERSION_MAJOR > 53
CODEC_ID_G723_1,
CODEC_ID_G729,
#endif
/* 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.