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

diff --git a/Makefile b/Makefile
index add8314..8269847 100644 (file)
--- 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
 

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 17b6c45..e49ee98 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -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 @@ OBJS= bitstream.o \
 
 
 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

diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c
index e294dbc..84336ef 100644 (file)
--- a/libavcodec/imgresample.c
+++ b/libavcodec/imgresample.c
@@ -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;

diff --git a/libavcodec/swscale.h b/libavcodec/swscale.h
deleted file mode 100644 (file)
index 69d5c0f..0000000
--- a/libavcodec/swscale.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * copyright (C) 2006 Luca Abeni
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SWSCALE_EMU_H
-#define SWSCALE_EMU_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Dummy, only useful for compilation! */
-#define SWS_FAST_BILINEAR 1
-#define SWS_BILINEAR 2
-#define SWS_BICUBIC  4
-#define SWS_X        8
-#define SWS_POINT    0x10
-#define SWS_AREA     0x20
-#define SWS_BICUBLIN 0x40
-#define SWS_GAUSS    0x80
-#define SWS_SINC     0x100
-#define SWS_LANCZOS  0x200
-#define SWS_SPLINE   0x400
-
-#define SwsFilter void
-struct SwsContext {
-    struct ImgReSampleContext *resampling_ctx;
-    enum PixelFormat src_pix_fmt, dst_pix_fmt;
-};
-
-struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
-                                  int dstW, int dstH, int dstFormat,
-                                  int flags, SwsFilter *srcFilter,
-                                  SwsFilter *dstFilter, double *param);
-
-int sws_scale(struct SwsContext *ctx, uint8_t* src[], int srcStride[],
-              int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]);
-
-void sws_freeContext(struct SwsContext *swsContext);
-
-struct SwsContext *sws_getCachedContext(struct SwsContext *context,
-                int srcW, int srcH, int srcFormat,
-                int dstW, int dstH, int dstFormat, int flags,
-                SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SWSCALE_EMU_H */

diff --git a/vhook/Makefile b/vhook/Makefile
index 2e699d2..e784d50 100644 (file)
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -3,13 +3,9 @@ include ../config.mak
 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)