[MPlayer-users] build failure on MacOS 10.5.8

[Reimar Döffinger]

On Sat, Jun 11, 2011 at 09:05:17PM +0200, Christian Ebert wrote:
> * Carl Eugen Hoyos on Wednesday, May 11, 2011 at 21:27:53 +0000
> > Christian Ebert <blacktrash <at> gmx.net> writes:
> > 
> >> cc -O -DCODECS2HTML -I. -Iffmpeg -o codec-cfg codec-cfg.c
> >> In file included from ./sub/ass_mp.h:27,
> >>                 from libmpdemux/demuxer.h:29,
> >>                 from libmpdemux/aviheader.h:27,
> >>                 from codec-cfg.c:57:
> >> ./sub/subreader.h:27:29: error: fribidi/fribidi.h: No such file or directory
> > 
> > This is a regression since r33440.
> > 
> > Could you test the following work-around?
> > Replace line 26 in sub/subreader.h (#ifdef CONFIG_FRIBIDI) with the following
> > #if defined(CONFIG_FRIBIDI) && !defined(CODECS2HTML)
> 
> FWIW, I still need the workaround for the build to succeed.

Still need to test it, but I intend to apply below change:
Index: codec-cfg.c
===================================================================
--- codec-cfg.c (revision 33647)
+++ codec-cfg.c (working copy)
@@ -53,9 +53,7 @@
 
 #include "help_mp.h"
 
-// for mmioFOURCC:
-#include "libmpdemux/aviheader.h"
-
+#include "libavutil/avutil.h"
 #include "libmpcodecs/img_format.h"
 #include "codec-cfg.h"
 
@@ -94,12 +92,12 @@
         goto err_out_too_many;
 
     do {
-        tmp = mmioFOURCC(s[0], s[1], s[2], s[3]);
+        tmp = MKTAG(s[0], s[1], s[2], s[3]);
         for (j = 0; j < i; j++)
             if (tmp == fourcc[j])
                 goto err_out_duplicated;
         fourcc[i] = tmp;
-        map[i] = alias ? mmioFOURCC(alias[0], alias[1], alias[2], alias[3]) : tmp;
+        map[i] = alias ? MKTAG(alias[0], alias[1], alias[2], alias[3]) : tmp;
         s += 4;
         i++;
     } while ((*(s++) == ',') && --freeslots);