diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 16:51:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 16:51:40 +0200 |
| commit | 364f36792199549e7cb1d1a96f7ddffec975bb61 (patch) | |
| tree | f2fc03660b0e93483aec1af2e2fc81affe62eee7 /libavcodec | |
| parent | 0e138745f79f9da6a28b39dbd321354fd1159068 (diff) | |
| download | ffmpeg-364f36792199549e7cb1d1a96f7ddffec975bb61.tar.gz | |
avcodec: add ifdef from qatar that could not be merged previously due to compilation failure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 4 insertions, 0 deletions
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, |