summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-07-07 07:38:24 +0300
committerUoti Urpala <uau@mplayer2.org>2011-07-07 07:38:24 +0300
commit5a997b81959e789fa07a6594684db0a446eda4f7 (patch)
tree0980989546fea4511a37d082fc785020dd6cf7f3
parentdb6b74e807b003fab59e54d60fbce8673c3b6596 (diff)
downloadmpv-5a997b81959e789fa07a6594684db0a446eda4f7.tar.bz2
mpv-5a997b81959e789fa07a6594684db0a446eda4f7.tar.xz
build: Revert "codec-cfg.c: avoid including aviheader.h"
This reverts commit 1e544365bfd09e4649cb720716f86ec5b75d86ce. I was careless when cherry-picking the reverted commit - the only effect it had was add an unnecessary libavutil dependency to a HOST_CC compiled file.
-rw-r--r--codec-cfg.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/codec-cfg.c b/codec-cfg.c
index 5237d7fadd..98b3088516 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -54,7 +54,6 @@
#endif
-#include <libavutil/avutil.h>
#include "libmpcodecs/img_format.h"
#include "codec-cfg.h"
@@ -97,12 +96,12 @@ static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc,
goto err_out_too_many;
do {
- tmp = MKTAG(s[0], s[1], s[2], s[3]);
+ tmp = mmioFOURCC(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 ? MKTAG(alias[0], alias[1], alias[2], alias[3]) : tmp;
+ map[i] = alias ? mmioFOURCC(alias[0], alias[1], alias[2], alias[3]) : tmp;
s += 4;
i++;
} while ((*(s++) == ',') && --freeslots);