[patch] wxsvg-1.0_beta10-new-ffmpeg-headers.patch

wxsvg-1.0_beta10-new-ffmpeg-headers.patch (text/plain), 1.28 KB, created by Ryan Hill (RETIRED) on 2008-07-04 16:30:46 UTC

diff -Naurp wxsvg-1.0b10-orig/configure.in wxsvg-1.0b10/configure.in
--- wxsvg-1.0b10-orig/configure.in	2008-01-15 06:59:31.000000000 -0600
+++ wxsvg-1.0b10/configure.in	2008-07-04 09:54:48.000000000 -0600
@@ -161,7 +161,7 @@ if test x$enable_ffmpeg = xyes; then
   AC_CHECK_LIB(avformat, av_register_all, [], [AC_MSG_ERROR([*** missing ffmpeg library: libavformat])])
   AC_CHECK_LIB(avcodec, avcodec_decode_audio2, [], [AC_MSG_ERROR([*** missing ffmpeg library: libavcodec])])
   AC_CHECK_LIB(swscale, sws_getContext)
-  AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([*** missing ffmpeg header file: ffmpeg/avcodec.h.])])
+  AC_CHECK_HEADERS(libavcodec/avcodec.h, [], [AC_MSG_ERROR([*** missing ffmpeg header file: libavcodec/avcodec.h.])])
   CXXFLAGS="$CXXFLAGS -DUSE_FFMPEG"
 fi
 
diff -Naurp wxsvg-1.0b10-orig/src/mediadec_ffmpeg.cpp wxsvg-1.0b10/src/mediadec_ffmpeg.cpp
--- wxsvg-1.0b10-orig/src/mediadec_ffmpeg.cpp	2008-03-02 12:43:54.000000000 -0600
+++ wxsvg-1.0b10/src/mediadec_ffmpeg.cpp	2008-07-04 09:55:53.000000000 -0600
@@ -23,8 +23,8 @@
 extern "C" {
 #define __STDC_CONSTANT_MACROS
 #define __STDC_LIMIT_MACROS
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/swscale.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
 }
 
 wxFfmpegMediaDecoder::wxFfmpegMediaDecoder():