From 7ce8ab7ad4b038aedb40470f1b0cd06b97919101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Mon, 10 Nov 2008 12:37:46 +0000
Subject: [PATCH] configure.ac: Fix typo: libswcale -> libswscale for the
 pkg-config check.

Original commit message from CVS:
* configure.ac:
Fix typo: libswcale -> libswscale for the pkg-config check.
* ext/libswscale/gstffmpegscale.c:
Fix include path, newer ffmpeg installs the headers for all
libraries into separate directories. Fixes bug #560137.
---
 ChangeLog                       | 9 +++++++++
 configure.ac                    | 2 +-
 ext/libswscale/gstffmpegscale.c | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a0b258d0c6..1c73e894d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-10  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* configure.ac:
+	Fix typo: libswcale -> libswscale for the pkg-config check.
+
+	* ext/libswscale/gstffmpegscale.c:
+	Fix include path, newer ffmpeg installs the headers for all
+	libraries into separate directories. Fixes bug #560137.
+
 2008-11-07  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_avpicture_fill):
diff --git a/configure.ac b/configure.ac
index 429c1a227a..0ff5fce7eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ AC_ARG_WITH(system-ffmpeg,
 if test "x$with_system_ffmpeg" = "xyes"; then
   PKG_CHECK_MODULES(FFMPEG, libavutil libavcodec libavformat)
   PKG_CHECK_MODULES(POSTPROC, libavutil libavcodec libpostproc)
-  PKG_CHECK_MODULES(SWSCALE, libavutil libswcale)
+  PKG_CHECK_MODULES(SWSCALE, libavutil libswscale)
   saved_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
   AC_CHECK_HEADERS([avi.h])
diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c
index 1f8b5aba16..30ea557f09 100644
--- a/ext/libswscale/gstffmpegscale.c
+++ b/ext/libswscale/gstffmpegscale.c
@@ -26,7 +26,7 @@
 #ifdef HAVE_FFMPEG_UNINSTALLED
 #include <swscale.h>
 #else
-#include <ffmpeg/swscale.h>
+#include <libswscale/swscale.h>
 #endif
 
 #include <gst/gst.h>