diff options
| author | Luca Abeni <lucabe72@email.it> | 2006-10-23 17:06:32 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2006-10-23 17:06:32 +0000 |
| commit | a163ed1aaae3d15ad59ca176f5f468a5e883c2cb (patch) | |
| tree | 65b1b1a133ae0e461048b553419c5745a0731f94 /Makefile | |
| parent | 755073fe3c0238aab282851f54cf9ffcf84065dc (diff) | |
| download | ffmpeg-a163ed1aaae3d15ad59ca176f5f468a5e883c2cb.tar.gz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -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 |