summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-02 20:41:47 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-02 20:54:13 +0200
commit14d31933913dcab7cc2a0c62a25d04237de92004 (patch)
tree6f2929ba306ceccba4acb62da7d624daf9c1a3d5
parenta6af927ea17f5c5a882902653aa95488b87ea512 (diff)
downloadmpv-14d31933913dcab7cc2a0c62a25d04237de92004.tar.bz2
mpv-14d31933913dcab7cc2a0c62a25d04237de92004.tar.xz
Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compile
codec-cfg runs on the host system but EXTRA_INC can have target system paths. The EXTRA_INC was added there for shared libavutil support. Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h (which in turn needed libavutil) instead of including the header, and drop the EXTRA_INC flags.
-rw-r--r--Makefile2
-rw-r--r--codec-cfg.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6a9793a9cf..30023693da 100644
--- a/Makefile
+++ b/Makefile
@@ -755,7 +755,7 @@ mplayer$(EXESUF): $(MPLAYER_DEPS)
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
- $(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -Iffmpeg -o $@ $<
+ $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./$^ > $@
diff --git a/codec-cfg.c b/codec-cfg.c
index 221c88dd18..5e7847db40 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -24,6 +24,7 @@
#include <ctype.h>
#include <assert.h>
#include <string.h>
+#include <stdint.h>
#include "config.h"
#include "mp_msg.h"
@@ -37,9 +38,6 @@
#include "help_mp.h"
-// for mmioFOURCC:
-#include "libmpdemux/aviheader.h"
-
#include "libmpcodecs/img_format.h"
#include "codec-cfg.h"
@@ -47,6 +45,10 @@
#include "codecs.conf.h"
#endif
+#define mmioFOURCC( ch0, ch1, ch2, ch3 ) \
+ ( (uint32_t)(uint8_t)(ch0) | ( (uint32_t)(uint8_t)(ch1) << 8 ) | \
+ ( (uint32_t)(uint8_t)(ch2) << 16 ) | ( (uint32_t)(uint8_t)(ch3) << 24 ) )
+
#define PRINT_LINENUM mp_msg(MSGT_CODECCFG,MSGL_ERR," at line %d\n", line_num)
#define MAX_NR_TOKEN 16