From 49d71c7b0511ffea3e9a09a05205142b8e45b0c3 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 21 May 2002 18:56:03 +0000 Subject: [PATCH] * 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 --- libavcodec/Makefile | 2 +- libavcodec/common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a38994ee41..cf026c7ea0 100644 --- 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 13018975c6..4b15612c40 100644 --- 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 #include