diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2011-06-19 09:10:35 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-06 13:01:07 +0300 |
| commit | 1e544365bfd09e4649cb720716f86ec5b75d86ce (patch) | |
| tree | f319ca3f774cee9d5bd62169c838572e660951bd /codec-cfg.c | |
| parent | b0a88d1362dd59fd02f27cca0a0683024266c36f (diff) | |
| download | mpv-1e544365bfd09e4649cb720716f86ec5b75d86ce.tar.bz2 mpv-1e544365bfd09e4649cb720716f86ec5b75d86ce.tar.xz | |
codec-cfg.c: avoid including aviheader.h
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
Diffstat (limited to 'codec-cfg.c')
| -rw-r--r-- | codec-cfg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 98b3088516..5237d7fadd 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -54,6 +54,7 @@ #endif +#include <libavutil/avutil.h> #include "libmpcodecs/img_format.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; 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); |