* avoid conflicts with non-ffmpeg config.h and also it's consistent

  with few other header files included from the main ffmpeg's dir

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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index a38994e..cf026c7 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -6,7 +6,7 @@ include ../config.mak
 
 VPATH=$(SRC_PATH)/libavcodec
 
-CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)
+CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I$(SRC_PATH)
 LDFLAGS= -g
 
 OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \

diff --git a/libavcodec/common.h b/libavcodec/common.h
index 1301897..4b15612 100644 (file)
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -17,7 +17,7 @@
 
 #ifdef HAVE_AV_CONFIG_H
 /* only include the following when compiling package */
-#include "config.h"
+#include "../config.h"
 
 #include <stdlib.h>
 #include <stdio.h>