From 19357940a57c565ebe319729bd08d6e4800aff5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sat, 1 Mar 2008 04:00:18 +0100
Subject: Update to the new FFmpeg's include directory. This also allows to
 remove the comment stating the includes come from libavutil, as it's now
 explicit.

---
 src/video_dec/libmpeg2/decode.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/video_dec/libmpeg2/decode.c')

diff --git a/src/video_dec/libmpeg2/decode.c b/src/video_dec/libmpeg2/decode.c
index b4e6e82c0..33d8b7ca9 100644
--- a/src/video_dec/libmpeg2/decode.c
+++ b/src/video_dec/libmpeg2/decode.c
@@ -37,8 +37,7 @@
 #define LOG
 */
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #include <xine/xine_internal.h>
 #include <xine/video_out.h>
-- 
cgit v1.2.3


From 8063ffb8c0b354d54834ba53b22003dac481de2c Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 9 Apr 2008 19:10:58 +0100
Subject: Compilation fixes, mostly ffmpeg-related, and linkage fixes. Tests
 done on amd64 with ffmpeg 0.svn20080206 from Debian experimental. libavcodec
 51.50.0, libavutil 49.6.0, libpostproc 51.1.0

---
 src/video_dec/libmpeg2/decode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/video_dec/libmpeg2/decode.c')

diff --git a/src/video_dec/libmpeg2/decode.c b/src/video_dec/libmpeg2/decode.c
index e9700d95f..a9db54847 100644
--- a/src/video_dec/libmpeg2/decode.c
+++ b/src/video_dec/libmpeg2/decode.c
@@ -37,7 +37,7 @@
 #define LOG
 */
 
-#include <libavutil/mem.h>
+#include <mem.h>
 
 #include <xine/xine_internal.h>
 #include <xine/video_out.h>
-- 
cgit v1.2.3