mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Fix typo: libswcale -> libswscale for the pkg-config check.

Browse source 
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:
Sebastian Dröge 2008-11-10 12:37:46 +00:00
parent 28cc187f59
commit 7ce8ab7ad4
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2008-11-07 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_avpicture_fill): * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_avpicture_fill):

2
configure.ac
View file

@ -212,7 +212,7 @@ AC_ARG_WITH(system-ffmpeg,
if test "x$with_system_ffmpeg" = "xyes"; then if test "x$with_system_ffmpeg" = "xyes"; then
PKG_CHECK_MODULES(FFMPEG, libavutil libavcodec libavformat) PKG_CHECK_MODULES(FFMPEG, libavutil libavcodec libavformat)
PKG_CHECK_MODULES(POSTPROC, libavutil libavcodec libpostproc) PKG_CHECK_MODULES(POSTPROC, libavutil libavcodec libpostproc)
PKG_CHECK_MODULES(SWSCALE, libavutil libswcale) PKG_CHECK_MODULES(SWSCALE, libavutil libswscale)
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS" CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
AC_CHECK_HEADERS([avi.h]) AC_CHECK_HEADERS([avi.h])

2
ext/libswscale/gstffmpegscale.c
View file

@ -26,7 +26,7 @@
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_FFMPEG_UNINSTALLED
#include <swscale.h> #include <swscale.h>
#else #else
#include <ffmpeg/swscale.h> #include <libswscale/swscale.h>
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>