From 5a997b81959e789fa07a6594684db0a446eda4f7 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 7 Jul 2011 07:38:24 +0300 Subject: 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. --- codec-cfg.c | 5 ++--- 1 file 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 #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); -- cgit v1.2.3