Commit 49d71c7b authored by Zdenek Kabelac's avatar Zdenek Kabelac

* 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
parent 4a908fbc
...@@ -6,7 +6,7 @@ include ../config.mak ...@@ -6,7 +6,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/libavcodec 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 LDFLAGS= -g
OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \ OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#ifdef HAVE_AV_CONFIG_H #ifdef HAVE_AV_CONFIG_H
/* only include the following when compiling package */ /* only include the following when compiling package */
#include "config.h" #include "../config.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment