# HG changeset patch
# User reimar
# Date 1308474635 0
# Node ID 1ff6737f2177471cdddb907d7ab44efa8fb7b1b3
# Parent  16cf555989a9dd7968d54edc27f6675da82f7a31
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.

diff -r 16cf555989a9 -r 1ff6737f2177 codec-cfg.c
--- a/codec-cfg.c	Sun Jun 19 08:33:57 2011 +0000
+++ b/codec-cfg.c	Sun Jun 19 09:10:35 2011 +0000
@@ -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);