diff -up transcode-1.1.6/configure.in.ffmpeg transcode-1.1.6/configure.in
--- transcode-1.1.6/configure.in.ffmpeg	2011-10-22 15:44:47.225664689 +0200
+++ transcode-1.1.6/configure.in	2011-10-22 15:44:52.613633923 +0200
@@ -592,92 +592,19 @@ else
   dnl
   dnl libavcodec
   dnl
-  LIBAVCODEC_EXTRA_LIBS="$LIBAVCODEC_EXTRA_LIBS $($PKG_CONFIG --libs libavcodec)"
-  TC_PKG_CHECK(libavcodec, optional, LIBAVCODEC, no, [libavcodec/avcodec.h],
-   avcodec, avcodec_thread_init, libavcodec, [http://www.ffmpeg.org/])
-  if test x"$have_libavcodec" = x"yes" ; then
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $LIBAVCODEC_CFLAGS"
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-  #include <stdio.h>
-  #include <libavcodec/avcodec.h>
-  int
-  main()
-  {
-    /* 3344640 == ((51<<16)+(9<<8)+0) == 51.9.0 */
-    if (LIBAVCODEC_BUILD < 3344640) {
-      printf("error: transcode needs at least libavcodec 51.9");
-      printf("install a cvs version after 20060814");
-      return(1);
-    }
-  
-    printf("VER=%s\n", AV_STRINGIFY(LIBAVCODEC_VERSION));
-    printf("BUILD=%d\n", LIBAVCODEC_BUILD);
-    return(0);
-  }
-  ]])],
-      [LIBAVCODEC_VERSION="`./conftest$ac_exeext | sed -ne 's,VER=\(.*\),\1,p'`"
-        LIBAVCODEC_BUILD="`./conftest$ac_exeext | sed -ne 's,BUILD=\(.*\),\1,p'`"],
-      [AC_MSG_RESULT([failed])
-       TC_PKG_ERROR(libavcodec, avcodec.h, required, FFmpeg, [http://www.ffmpeg.org],
-        [cannot compile avcodec.h])],
-      [AC_MSG_RESULT([cross compiling; assumed OK...])
-        LIBAVCODEC_VERSION=""
-        LIBAVCODEC_BUILD=""])
-    CPPFLAGS="$save_CPPFLAGS"
-  fi
-  AC_SUBST(LIBAVCODEC_VERSION)
-  AC_SUBST(LIBAVCODEC_BUILD)
-  AC_SUBST(LIBAVCODEC_CFLAGS)
-  AC_SUBST(LIBAVCODEC_LIBS)
+  TC_PKG_CONFIG_CHECK(libavcodec, no, LIBAVCODEC, libavcodec, [http://www.ffmpeg.org/])
+  TC_PKG_HAVE(libavcodec, LIBAVCODEC)
+
   
   dnl
   dnl libavformat
   dnl
-  LIBAVFORMAT_EXTRA_LIBS="$LIBAVFORMAT_EXTRA_LIBS $($PKG_CONFIG --libs libavformat)"
-  TC_PKG_CHECK(libavformat, optional, LIBAVFORMAT, no, [libavformat/avformat.h],
-   avformat, av_register_all, libavformat, [http://www.ffmpeg.org/])
-  if test x"$have_libavformat" = x"yes" ; then
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $LIBAVFORMAT_CFLAGS"
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-  #include <stdio.h>
-  #include <libavformat/avformat.h>
-  #include <libavcodec/avcodec.h>
-  int
-  main()
-  {
-    /* 3278080 == ((50<<16)+(5<<8)+0) == 50.5.0 */
-    if (LIBAVFORMAT_BUILD < 3278080) {
-      printf("error: transcode needs at least libavformat 50.5");
-      printf("install a cvs version after 20060814");
-      return(1);
-    }
-  
-    printf("VER=%s\n", AV_STRINGIFY(LIBAVFORMAT_VERSION));
-    printf("BUILD=%d\n", LIBAVFORMAT_BUILD);
-    return(0);
-  }
-  ]])],
-      [LIBAVFORMAT_VERSION="`./conftest$ac_exeext | sed -ne 's,VER=\(.*\),\1,p'`"
-        LIBAVFORMAT_BUILD="`./conftest$ac_exeext | sed -ne 's,BUILD=\(.*\),\1,p'`"],
-      [AC_MSG_RESULT([failed])
-       TC_PKG_ERROR(libavformat, ffmpeg/avformat.h, required, FFmpeg, [http://www.ffmpeg.org],
-        [cannot compile ffmpeg/avformat.h])],
-      [AC_MSG_RESULT([cross compiling; assumed OK...])
-        LIBAVCODEC_VERSION=""
-        LIBAVCODEC_BUILD=""])
-    CPPFLAGS="$save_CPPFLAGS"
-  fi
-  dnl FIXME: the ffmpeg developers are being INCREDIBLY STUPID. argh.
-  LIBAVFORMAT_CFLAGS="$LIBAVFORMAT_CFLAGS -Dattribute_deprecated="
+  TC_PKG_CONFIG_CHECK(libavformat, no, LIBAVFORMAT, libavformat, [http://www.ffmpeg.org/])
+  TC_PKG_HAVE(libavformat, LIBAVFORMAT)
 
   AC_DEFINE([HAVE_FFMPEG], 1, [Have FFmpeg libraries support])
 fi
-AC_SUBST(LIBAVFORMAT_VERSION)
-AC_SUBST(LIBAVFORMAT_BUILD)
-AC_SUBST(LIBAVFORMAT_CFLAGS)
-AC_SUBST(LIBAVFORMAT_LIBS)
+
 AM_CONDITIONAL(HAVE_FFMPEG, test x"$enable_ffmpeg" = x"yes")