[MPlayer-dev-eng] [PATCH] include config.h before img_format.h

Alan Curry pacman at theworld.com
Wed Feb 15 22:21:18 CET 2006


Diego Biurrun writes the following:
>
>On Thu, Feb 09, 2006 at 02:56:36PM -0500, Alan Curry wrote:
[... on the subject of getting the wrong IMGFMT_* definitions because they
 depend on WORDS_BIGENDIAN, defined in config.h]
>> If that's the way you're going to fix it, there are at least 2 other places
>> that need the same fix. I found them by sticking a #error in the
>> non-WORDS_BIGENDIAN section of img_format.h and recompiling everything. They
>> were vf_bmovl.c and sub_cc.c - and those are just the ones that are
>> compilable on my machine.
>
>Send a patch..

OK, I tried to find more instances of this problem, and it looks like those
are the only 2. sub_cc.c includes img_format.h indirectly via video_out.h,
and doesn't appear to actually use the IMGFMT_* constants, so it might not
really be necessary to get them defined correctly. But what harm can it do?

-------------- next part --------------
Index: sub_cc.c
===================================================================
RCS file: /cvsroot/mplayer/main/sub_cc.c,v
retrieving revision 1.5
diff -u -r1.5 sub_cc.c
--- sub_cc.c	9 Feb 2006 14:07:53 -0000	1.5
+++ sub_cc.c	15 Feb 2006 01:09:36 -0000
@@ -21,6 +21,7 @@
 
 #include "subreader.h"
 
+#include "config.h"
 #include "libvo/video_out.h"
 #include "libvo/sub.h"
 
Index: libmpcodecs/vf_bmovl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_bmovl.c,v
retrieving revision 1.13
diff -u -r1.13 vf_bmovl.c
--- libmpcodecs/vf_bmovl.c	18 Nov 2005 14:39:22 -0000	1.13
+++ libmpcodecs/vf_bmovl.c	15 Feb 2006 01:09:43 -0000
@@ -65,8 +65,8 @@
 #include <fcntl.h>
 #include "mp_image.h"
 #include "vf.h"
-#include "img_format.h"
 #include "config.h"
+#include "img_format.h"
 
 #ifndef HAVE_NO_POSIX_SELECT
 


More information about the MPlayer-dev-eng mailing list