From a163ed1aaae3d15ad59ca176f5f468a5e883c2cb Mon Sep 17 00:00:00 2001
From: Luca Abeni <lucabe72@email.it>
Date: Mon, 23 Oct 2006 17:06:32 +0000
Subject: Do not use a fake libavcodec/swscale.h, but always use the real one
 (from libswscale) instead

Originally committed as revision 6777 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Makefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index add8314583..8269847f8f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,10 @@ include config.mak
 VPATH=$(SRC_PATH)
 
 CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
-       -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \
+       -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
 LDFLAGS+= -g
 
-ifeq ($(CONFIG_SWSCALER),yes)
-CFLAGS := -I$(SRC_PATH)/libswscale $(CFLAGS)
-endif
-
 MANPAGES=doc/ffmpeg.1
 PROGS_G+=ffmpeg_g$(EXESUF)
 PROGS+=ffmpeg$(EXESUF)
@@ -166,9 +162,7 @@ install-headers:
 ifeq ($(CONFIG_PP),yes)
 	$(MAKE) -C libpostproc install-headers
 endif
-ifeq ($(CONFIG_SWSCALER),yes)
 	$(MAKE) -C libswscale  install-headers
-endif
 
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
 
-- 
cgit v1.2.3