vlc | branch: master | Zoran Turalija <[email protected]> | Mon Mar 25 10:40:01 2013 +0100| [620da47221e5bf30cbffb1a591268e6b1a5edea8] | committer: Rémi Denis-Courmont
avcodec: Compile again with FFmpeg libavcodec library. Make fails when using FFmpeg libavcodec version newer than checked by LIBAVCODEC_VERSION_CHECK, because of redeclaration of many enumerators, that are unnecessary with newer version of libavcodec library. It is due to missing parenthesis in macro definition that are making it wrong. Probably same with libav libavcodec library, too. Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=620da47221e5bf30cbffb1a591268e6b1a5edea8 --- modules/codec/avcodec/avcommon_compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h index 9cf651e..e24873c 100644 --- a/modules/codec/avcodec/avcommon_compat.h +++ b/modules/codec/avcodec/avcommon_compat.h @@ -33,8 +33,8 @@ * b and c the minor and micro versions of libav * d and e the minor and micro versions of FFmpeg */ #define LIBAVCODEC_VERSION_CHECK( a, b, c, d, e ) \ - (LIBAVCODEC_VERSION_MICRO < 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ - (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) + ( (LIBAVCODEC_VERSION_MICRO < 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ + (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) #if LIBAVCODEC_VERSION_MAJOR < 54 # define AV_PICTURE_TYPE_B FF_B_TYPE _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
