From 364f36792199549e7cb1d1a96f7ddffec975bb61 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 22 Oct 2011 16:51:40 +0200 Subject: [PATCH] avcodec: add ifdef from qatar that could not be merged previously due to compilation failure. Signed-off-by: Michael Niedermayer --- libavcodec/avcodec.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c2b9096d87..4bbaab981a 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,