added HAVE_AV_CONFIG_H

Originally committed as revision 19 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libav/Makefile b/libav/Makefile
index 0f5dcf32af1c95ec29845ff4e489b36153111195..ac25e49622930fbf840f8fe2d9eb18f1bee8687e 100644 (file)
--- a/libav/Makefile
+++ b/libav/Makefile
@@ -1,5 +1,5 @@
 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 \
         avidec.o ffm.o \

diff --git a/libavcodec/common.h b/libavcodec/common.h
index 3b46035a64d2804d4382d07fc4c950189cfee40a..e6cb5fbe818c94b2f46d6f6c2f925d02c6b8c08d 100644 (file)
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -1,7 +1,9 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#ifdef HAVE_AV_CONFIG_H
 #include "../config.h"
+#endif
 
 #ifndef __WINE_WINDEF16_H
 /* workaround for typedef conflict in MPlayer (wine typedefs) */