Fix build with (Debian's) system ffmpeg. Fixes bug #532803.

Original commit message from CVS:
* configure.ac:
* ext/ffmpeg/gstffmpegcodecmap.c:
* ext/ffmpeg/gstffmpegdemux.c:
* ext/libpostproc/gstpostproc.c:
Fix build with (Debian's) system ffmpeg. Fixes bug #532803.

ChangeLog

+2008-05-13  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* configure.ac:
+	* ext/ffmpeg/gstffmpegcodecmap.c:
+	* ext/ffmpeg/gstffmpegdemux.c:
+	* ext/libpostproc/gstpostproc.c:
+	Fix build with (Debian's) system ffmpeg. Fixes bug #532803.
+
 2008-05-13  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* configure.ac:

configure.ac

@@ -207,7 +207,7 @@ AC_ARG_WITH(system-ffmpeg,
             [AC_HELP_STRING([--with-system-ffmpeg], [use system FFmpeg libraries])])
 
 if test "x$with_system_ffmpeg" = "xyes"; then
-  PKG_CHECK_MODULES(FFMPEG, libavutil libavcodec libavformat)
+  PKG_CHECK_MODULES(FFMPEG, libavutil libavcodec libavformat libswscale)
   PKG_CHECK_MODULES(POSTPROC, libavcodec libpostproc)
   saved_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
@@ -303,9 +303,10 @@ AC_SUBST(FFMPEG_LIBS)
 AC_SUBST(FFMPEG_SUBDIRS)
 AC_SUBST(POSTPROC_CFLAGS)
 AC_SUBST(POSTPROC_LIBS)
-  
-AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, $HAVE_FFMPEG_UNINSTALLED,
-                   [Defined if building against uninstalled FFmpeg source])
+ 
+if test x$HAVE_FFMPEG_UNINSTALLED = x1; then
+  AC_DEFINE(HAVE_FFMPEG_UNINSTALLED, [], [Defined if building against uninstalled FFmpeg source])
+fi
 AM_CONDITIONAL(HAVE_FFMPEG_UNINSTALLED, test x$HAVE_FFMPEG_UNINSTALLED = x1)
 
 AC_CONFIG_FILES(

ext/ffmpeg/gstffmpegcodecmap.c

@@ -27,6 +27,7 @@
 #include <avcodec.h>
 #include <libswscale/swscale.h>
 #else
+#include <ffmpeg/swscale.h>
 #include <ffmpeg/avcodec.h>
 #endif
 #include <string.h>

ext/ffmpeg/gstffmpegdemux.c

@@ -31,8 +31,10 @@
 #endif
 #else
 #include <ffmpeg/avformat.h>
+#ifdef HAVE_AVI_H
 #include <ffmpeg/avi.h>
 #endif
+#endif
 #include <gst/gst.h>
 
 #include "gstffmpeg.h"