github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

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.
This commit is contained in:
Uoti Urpala 2008-12-02 20:41:47 +02:00
parent a6af927ea1
commit 14d3193391
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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
./$^ > $@

8
codec-cfg.c
View File

@ -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