aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2001-07-30 23:22:07 +0000
committerFabrice Bellard <fabrice@bellard.org>2001-07-30 23:22:07 +0000
commit420b073bbcce462d47c8020ce30112627c08ac13 (patch)
tree6cc544beeaab6b4f6b81dd296d4aeb50ea563cc1
parent2b0c1a441ba16d8d06054b774763d2b1934cfb04 (diff)
downloadffmpeg-420b073bbcce462d47c8020ce30112627c08ac13.tar.gz
added HAVE_AV_CONFIG_H
Originally committed as revision 19 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libav/Makefile2
-rw-r--r--libavcodec/common.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/libav/Makefile b/libav/Makefile
index 0f5dcf32af..ac25e49622 100644
--- 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 3b46035a64..e6cb5fbe81 100644
--- 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) */