From 463ea05ab24ad0d27b54e985cab1a9a9c953285c Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 19 Oct 2011 23:12:56 +0200 Subject: [PATCH] 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. --- libavcodec/avcodec.h | 6 ++++++ 1 file changed, 6 insertions(+) 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.