diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-10-19 23:12:56 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-10-20 00:19:19 +0200 |
| commit | 463ea05ab24ad0d27b54e985cab1a9a9c953285c (patch) | |
| tree | d3e80f90a99242450ebefb618aae55be3de5e324 /libavcodec | |
| parent | 26af0953c0ba800aae2d52cbdaeca7b387a317bc (diff) | |
| download | ffmpeg-463ea05ab24ad0d27b54e985cab1a9a9c953285c.tar.gz | |
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.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c2a3098eeb..06cede98ad 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -210,8 +210,10 @@ enum CodecID { CODEC_ID_DFA, CODEC_ID_WMV3IMAGE, CODEC_ID_VC1IMAGE, +#if LIBAVCODEC_VERSION_MAJOR == 53 CODEC_ID_G723_1, CODEC_ID_G729, +#endif CODEC_ID_UTVIDEO, /* various PCM "codecs" */ @@ -345,6 +347,10 @@ enum CodecID { CODEC_ID_AAC_LATM, CODEC_ID_QDMC, CODEC_ID_CELT, +#if LIBAVCODEC_VERSION_MAJOR > 53 + CODEC_ID_G723_1, + CODEC_ID_G729, +#endif /* subtitle codecs */ CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. |