[FFmpeg-cvslog] avcodec: add ifdef from qatar that could not be merged previously due to compilation failure .

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 22 16:51:40 2011 +0200| [364f36792199549e7cb1d1a96f7ddffec975bb61] | committer: Michael Niedermayer

avcodec: add ifdef from qatar that could not be merged previously due to compilation failure.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=364f36792199549e7cb1d1a96f7ddffec975bb61
---

 libavcodec/avcodec.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c2b9096..4bbaab9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -348,6 +348,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
     CODEC_ID_G729 = 0x15800,
     CODEC_ID_G723_1= 0x15801,