summaryrefslogtreecommitdiff
path: root/src/libffmpeg/diff_to_ffmpeg_cvs.txt
diff options
context:
space:
mode:
authorRobin KAY <komadori@users.sourceforge.net>2004-02-20 19:53:38 +0000
committerRobin KAY <komadori@users.sourceforge.net>2004-02-20 19:53:38 +0000
commit5ce8c5d439863d315b74e73ea81b35559e7fcc04 (patch)
tree7963ae71d642a796de825a9e014dcbf624b9f85d /src/libffmpeg/diff_to_ffmpeg_cvs.txt
parentf3d1e1c3c4810364dfc3b77ef0deca7b4fa1d02b (diff)
downloadxine-lib-5ce8c5d439863d315b74e73ea81b35559e7fcc04.tar.gz
xine-lib-5ce8c5d439863d315b74e73ea81b35559e7fcc04.tar.bz2
Fixed detection of linux framebuffer support. Included xineutils.h in dsputil_mlib.c and added to diff_to_ffmpeg_cvs.txt. Fixed function prototype in dsputil_mlib.c (should be sent back to ffmpeg-dev at some point). Fixed includes in nosefart. Fixed nested comments and includes in goom.
CVS patchset: 6180 CVS date: 2004/02/20 19:53:38
Diffstat (limited to 'src/libffmpeg/diff_to_ffmpeg_cvs.txt')
-rw-r--r--src/libffmpeg/diff_to_ffmpeg_cvs.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt
index 348b9a315..b70c44797 100644
--- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt
+++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt
@@ -526,6 +526,15 @@ retrieving revision 1.14
diff -u -r1.14 dsputil_mlib.c
--- mlib/dsputil_mlib.c 11 Oct 2003 16:43:51 -0000 1.14
+++ mlib/dsputil_mlib.c 1 Feb 2004 04:42:48 -0000
+@@ -20,6 +20,8 @@
+ #include "../dsputil.h"
+ #include "../mpegvideo.h"
+
++#include "../../../xine-utils/xineutils.h"
++
+ #include <mlib_types.h>
+ #include <mlib_status.h>
+ #include <mlib_sys.h>
@@ -419,6 +419,7 @@
void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx)