vlc | branch: master | Ilkka Ollakka <[email protected]> | Tue Aug 14 16:20:52 2012 +0300| [770ce7dbcca318c74c2d98886c13fcf0c00789d6] | committer: Ilkka Ollakka
avcodec: move version check to avcodec.h > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=770ce7dbcca318c74c2d98886c13fcf0c00789d6 --- modules/codec/avcodec/avcodec.h | 10 ++++++++++ modules/codec/avcodec/fourcc.c | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index e5a5825..34e00a6 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -278,6 +278,16 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ); # define HAVE_AVCODEC_MT #endif + +/* LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg + * a is the major version + * 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 ) ) + + /* Uncomment it to enable compilation with vaapi/dxva2/vda (you also must change the build * system) */ //#define HAVE_AVCODEC_VAAPI 1 diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index eddd7e9..ad61157 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -36,14 +36,6 @@ #endif #include "avcodec.h" -/* LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg - * a is the major version - * 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 ) ) - /***************************************************************************** * Codec fourcc -> ffmpeg_id mapping *****************************************************************************/ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
