[vlc-commits] Avcodec: require avutil 49.5.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Aug 16 17:24:13 2012 +0200| [fbd676f32c6b83d7bc33c5315573030e6d52662c] | committer: Jean-Baptiste Kempf

Avcodec: require avutil 49.5.0

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fbd676f32c6b83d7bc33c5315573030e6d52662c
---

 configure.ac                   |    2 +-
 modules/codec/avcodec/chroma.c |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e536ecd..2091678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2306,7 +2306,7 @@ dnl
 AC_ARG_ENABLE(avcodec,
 [  --enable-avcodec        libavcodec codec (default enabled)])
 AS_IF([test "${enable_avcodec}" != "no"], [
-  PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil],
+  PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil >= 49.5.0],
     [
       VLC_SAVE_FLAGS
       CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c
index b100423..809491f 100644
--- a/modules/codec/avcodec/chroma.c
+++ b/modules/codec/avcodec/chroma.c
@@ -64,10 +64,8 @@ static const struct
     {VLC_CODEC_I444, PIX_FMT_YUV444P, 0, 0, 0 },
     {VLC_CODEC_J444, PIX_FMT_YUVJ444P, 0, 0, 0 },
 
-#if LIBAVUTIL_VERSION_INT >= ((49<<16)+(5<<8)+0)
     {VLC_CODEC_I440, PIX_FMT_YUV440P, 0, 0, 0 },
     {VLC_CODEC_J440, PIX_FMT_YUVJ440P, 0, 0, 0 },
-#endif
 
     {VLC_CODEC_I422, PIX_FMT_YUV422P, 0, 0, 0 },
     {VLC_CODEC_J422, PIX_FMT_YUVJ422P, 0, 0, 0 },