libav: Minor changes to build properly with v11alpha1

diff --git a/configure.ac b/configure.ac
index 229ea9b..64be10b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -246,7 +246,7 @@ AC_ARG_WITH(system-libav,
             [AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])
 
 if test "x$with_system_libav" = "xyes"; then
-  PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavutil) 
+  PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavresample libavutil)
   PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
   saved_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"
@@ -265,12 +265,13 @@ else
 
   LIBAV_DEPS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
               \$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \
+              \$(top_builddir)/gst-libs/ext/libav/libavresample/libavresample.a \
               \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
   if test "x$enable_static_plugins" = xyes; then
       dnl with static linking we can't use the .a archive directly as they would
       dnl be included in the final libgstlibav.a as a file and won't be usable.
       dnl libav*.a must be copied to the final destination too
-      LIBAV_LIBS="-lavformat -lavcodec -lavutil"
+      LIBAV_LIBS="-lavformat -lavcodec -lavresample -lavutil"
   else
       dnl libgstlibav.la: libs to statically link to
       LIBAV_LIBS="$LIBAV_DEPS"

diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c
index a635fd4..a85f547 100644 (file)
--- a/ext/libav/gstavcfg.c
+++ b/ext/libav/gstavcfg.c
@@ -176,7 +176,7 @@ gst_ffmpeg_idct_algo_get_type (void)
       {FF_IDCT_SH4, "SH4", "sh4"},
       {FF_IDCT_SIMPLEARM, "Simple ARM", "simplearm"},
       {FF_IDCT_IPP, "IPP", "ipp"},
-      {FF_IDCT_XVIDMMX, "XVID MMX", "xvidmmx"},
+      {FF_IDCT_XVID, "XVID", "xvid"},
       {FF_IDCT_SIMPLEARMV5TE, "Simple ARMV5TE", "simplearmv5te"},
       {FF_IDCT_SIMPLEARMV6, "Simple ARMV6", "simplearmv6"},
       {FF_IDCT_SIMPLEVIS, "Simple Vis", "simplevis"},