RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added HAVE_AV_CONFIG_H 

Originally committed as revision 19 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2001-07-30 23:22:07 +00:00
parent 2b0c1a441b
commit 420b073bbc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libav/Makefile
View File

@ -1,5 +1,5 @@
include ../config.mak include ../config.mak
CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec -DHAVE_AV_CONFIG_H
OBJS= rm.o mpeg.o asf.o avienc.o jpegenc.o swf.o wav.o raw.o \ OBJS= rm.o mpeg.o asf.o avienc.o jpegenc.o swf.o wav.o raw.o \
avidec.o ffm.o \ avidec.o ffm.o \

2
libavcodec/common.h
View File

@ -1,7 +1,9 @@
#ifndef COMMON_H #ifndef COMMON_H
#define COMMON_H #define COMMON_H
#ifdef HAVE_AV_CONFIG_H
#include "../config.h" #include "../config.h"
#endif
#ifndef __WINE_WINDEF16_H #ifndef __WINE_WINDEF16_H
/* workaround for typedef conflict in MPlayer (wine typedefs) */ /* workaround for typedef conflict in MPlayer (wine typedefs) */