mpeg4ip-1.6.1-ffmpeg-headers.patch

Pagine: < 1 >
SCARICA
diff -ru mpeg4ip-1.6.1.or/configure.in mpeg4ip-1.6.1/configure.in
--- mpeg4ip-1.6.1.or/configure.in	2009-06-13 16:44:42.000000000 +0200
+++ mpeg4ip-1.6.1/configure.in	2009-06-13 16:59:57.000000000 +0200
@@ -513,9 +513,9 @@
         AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
         FFMPEG_INC=
         FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"
-        AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])
-	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])
-	AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include <ffmpeg/avcodec.h>])
+        AC_CHECK_TYPES([AVRational], , , [#include <libavcodec/avcodec.h>])
+	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <libavcodec/avcodec.h>])
+	AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include <libavcodec/avcodec.h>])
         AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])
 	AC_CHECK_LIB(amrnb, VADxEncoder_Interface_init, 
 		     [have_amr_nb=true], [have_amr_nb=false])
diff -ru mpeg4ip-1.6.1.or/player/plugin/video/ffmpeg/ffmpeg.h mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h
--- mpeg4ip-1.6.1.or/player/plugin/video/ffmpeg/ffmpeg.h	2009-06-13 16:44:42.000000000 +0200
+++ mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h	2009-06-13 17:01:12.000000000 +0200
@@ -27,8 +27,8 @@
 #include "codec_plugin.h"
 extern "C" {
 #ifdef HAVE_FFMPEG_INSTALLED
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/swscale.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 #else
 #include <avcodec.h>
 #endif
diff -ru mpeg4ip-1.6.1.or/server/mp4live/audio_ffmpeg.h mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h
--- mpeg4ip-1.6.1.or/server/mp4live/audio_ffmpeg.h	2009-06-13 16:44:42.000000000 +0200
+++ mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h	2009-06-13 17:01:42.000000000 +0200
@@ -26,7 +26,7 @@
 extern "C" {
 #ifdef HAVE_FFMPEG_INSTALLED
 extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 }
 #else
 extern "C" {
diff -ru mpeg4ip-1.6.1.or/server/mp4live/video_encoder_class.cpp mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp
--- mpeg4ip-1.6.1.or/server/mp4live/video_encoder_class.cpp	2009-06-13 16:44:42.000000000 +0200
+++ mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp	2009-06-13 17:01:58.000000000 +0200
@@ -28,7 +28,7 @@
 extern "C" {
 #ifdef HAVE_FFMPEG_INSTALLED
 extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 }
 #else
 extern "C" {
diff -ru mpeg4ip-1.6.1.or/server/mp4live/video_ffmpeg.h mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h
--- mpeg4ip-1.6.1.or/server/mp4live/video_ffmpeg.h	2009-06-13 16:44:42.000000000 +0200
+++ mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h	2009-06-13 17:02:12.000000000 +0200
@@ -26,7 +26,7 @@
 extern "C" {
 #ifdef HAVE_FFMPEG_INSTALLED
 extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 }
 #else
 extern "C" {
diff -ru mpeg4ip-1.6.1.orig/player/plugin/audio/ffmpeg/ffmpeg.h mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h
--- mpeg4ip-1.6.1.orig/player/plugin/audio/ffmpeg/ffmpeg.h	2007-07-02 22:26:01.000000000 +0200
+++ mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h	2009-06-13 18:24:13.000000000 +0200
@@ -26,7 +26,7 @@
 #include "codec_plugin.h"
 extern "C" {
 #ifdef HAVE_FFMPEG_INSTALLED
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 #else
 #include <avcodec.h>
 #endif