ffmpeg | branch: master | Andreas Cadhalpun <[email protected]> | Sat Aug 8 10:41:29 2015 +0200| [2e9c8be8342c10a6cc3a124298e27a5d2234512f] | committer: Andreas Cadhalpun
avcodec: add missing FF_API_CODEC_ID guard Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e9c8be8342c10a6cc3a124298e27a5d2234512f --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 5dbd0cf..22dcc82 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3275,11 +3275,13 @@ unsigned avcodec_version(void) av_assert0(AV_CODEC_ID_SRT==94216); av_assert0(LIBAVCODEC_VERSION_MICRO >= 100); +#if FF_API_CODEC_ID av_assert0(CODEC_ID_CLLC == AV_CODEC_ID_CLLC); av_assert0(CODEC_ID_PCM_S8_PLANAR == AV_CODEC_ID_PCM_S8_PLANAR); av_assert0(CODEC_ID_ADPCM_IMA_APC == AV_CODEC_ID_ADPCM_IMA_APC); av_assert0(CODEC_ID_ILBC == AV_CODEC_ID_ILBC); av_assert0(CODEC_ID_SRT == AV_CODEC_ID_SRT); +#endif return LIBAVCODEC_VERSION_INT; } _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
