mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 14:26:43 +00:00
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.
This commit is contained in:
parent
28cc187f59
commit
7ce8ab7ad4
3 changed files with 11 additions and 2 deletions
|
@ -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):
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue