[Ffmpeg-cvslog] r6777 - in trunk: Makefile libavcodec/Makefile libavcodec/imgresample.c libavcodec/swscale.h vhook/Makefile

[lucabe]

Author: lucabe
Date: Mon Oct 23 19:06:32 2006
New Revision: 6777

Removed:
   trunk/libavcodec/swscale.h
Modified:
   trunk/Makefile
   trunk/libavcodec/Makefile
   trunk/libavcodec/imgresample.c
   trunk/vhook/Makefile

Log:
Do not use a fake libavcodec/swscale.h, but always use the real one
(from libswscale) instead


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Oct 23 19:06:32 2006
@@ -7,14 +7,10 @@
 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 @@
 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
 

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Mon Oct 23 19:06:32 2006
@@ -4,7 +4,7 @@
 #
 include ../config.mak
 
-CFLAGS+=$(AMR_CFLAGS)
+CFLAGS+=-I$(SRC_PATH)/libswscale $(AMR_CFLAGS)
 
 OBJS= bitstream.o \
       utils.o \
@@ -45,9 +45,6 @@
 
 
 HEADERS = avcodec.h opt.h
-ifneq ($(CONFIG_SWSCALER),yes)
-HEADERS += swscale.h
-endif
 
 OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
 OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o

Modified: trunk/libavcodec/imgresample.c
==============================================================================
--- trunk/libavcodec/imgresample.c	(original)
+++ trunk/libavcodec/imgresample.c	Mon Oct 23 19:06:32 2006
@@ -47,6 +47,11 @@
 
 #define LINE_BUF_HEIGHT (NB_TAPS * 4)
 
+struct SwsContext {
+    struct ImgReSampleContext *resampling_ctx;
+    enum PixelFormat src_pix_fmt, dst_pix_fmt;
+};
+
 struct ImgReSampleContext {
     int iwidth, iheight, owidth, oheight;
     int topBand, bottomBand, leftBand, rightBand;

Modified: trunk/vhook/Makefile
==============================================================================
--- trunk/vhook/Makefile	(original)
+++ trunk/vhook/Makefile	Mon Oct 23 19:06:32 2006
@@ -3,13 +3,9 @@
 VPATH=$(SRC_PATH)/vhook
 
 CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \
-       -I$(SRC_PATH)/libavformat $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H
+       -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H
 LDFLAGS+= -g
 
-ifeq ($(CONFIG_SWSCALER),yes)
-CFLAGS := -I$(SRC_PATH)/libswscale $(CFLAGS)
-endif
-
 HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
 ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)