RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-20 10:17:31 +00:00
Code Issues Releases Wiki Activity

codec-cfg.c: avoid including aviheader.h

Browse Source 
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.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33649 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2011-06-19 09:10:35 +00:00 committed by Uoti Urpala
parent b0a88d1362
commit 1e544365bf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
codec-cfg.c
View File

@ -54,6 +54,7 @@
#endif #endif
#include <libavutil/avutil.h>
#include "libmpcodecs/img_format.h" #include "libmpcodecs/img_format.h"
#include "codec-cfg.h" #include "codec-cfg.h"
@ -96,12 +97,12 @@ static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc,
goto err_out_too_many; goto err_out_too_many;
do { 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++) for (j = 0; j < i; j++)
if (tmp == fourcc[j]) if (tmp == fourcc[j])
goto err_out_duplicated; goto err_out_duplicated;
fourcc[i] = tmp; 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; s += 4;
i++; i++;
} while ((*(s++) == ',') && --freeslots); } while ((*(s++) == ',') && --freeslots);