[MPlayer-cvslog] r33649 - trunk/codec-cfg.c

[reimar]

Author: reimar
Date: Sun Jun 19 11:10:35 2011
New Revision: 33649

Log:
Avoid including aviheader.h only for mmioFOURCC, it has too many
dependencies, including even subreader.h and via that fribidi.

This causes issues both when cross-compiling and for CODEC2HTML
compilation, so instead use avutil.h/MKTAG.

Modified:
   trunk/codec-cfg.c

Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c	Sun Jun 19 10:33:57 2011	(r33648)
+++ trunk/codec-cfg.c	Sun Jun 19 11:10:35 2011	(r33649)
@@ -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 @@ static int add_to_fourcc(char *s, char *
         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);