diff options
| author | Luca Abeni <lucabe72@email.it> | 2006-08-08 18:51:38 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2006-08-08 18:51:38 +0000 |
| commit | 790c9ca72af601e4480b8152ef92b9acb15b1a11 (patch) | |
| tree | 43b420d5bac55fb302b24753448fe9ee3ab95c19 /libavcodec | |
| parent | b9b18fbdeaa364e160c5f1df164befa3dde6e833 (diff) | |
Enable swscale usage in ffmpeg
Originally committed as revision 5959 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 9 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3bb13a2850..38781f70a3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -11,7 +11,7 @@ CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil \ OBJS= bitstream.o utils.o allcodecs.o \ mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ mjpeg.o resample.o resample2.o dsputil.o \ - motion_est.o imgconvert.o imgresample.o \ + motion_est.o imgconvert.o \ mpeg12.o mpegaudiodec.o simple_idct.o \ ratecontrol.o eval.o error_resilience.o \ fft.o mdct.o raw.o golomb.o cabac.o\ @@ -22,6 +22,9 @@ OBJS= bitstream.o utils.o allcodecs.o \ HEADERS = avcodec.h +ifneq ($(CONFIG_SWSCALER),yes) +HEADERS += swscale.h +endif OBJS-$(CONFIG_AASC_DECODER) += aasc.o OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o @@ -277,6 +280,10 @@ OBJS-$(HAVE_BEOSTHREADS) += beosthread.o OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o +ifneq ($(CONFIG_SWSCALER),yes) +OBJS += imgresample.o +endif + # i386 mmx specific stuff ifeq ($(TARGET_MMX),yes) OBJS += i386/fdct_mmx.o i386/cputest.o \ diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index cc1a825fc6..776b72dad6 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -2048,6 +2048,7 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix return 0; } +#ifndef CONFIG_SWSCALER /* XXX: always use linesize. Return -1 if not supported */ int img_convert(AVPicture *dst, int dst_pix_fmt, const AVPicture *src, int src_pix_fmt, @@ -2289,6 +2290,7 @@ int img_convert(AVPicture *dst, int dst_pix_fmt, avpicture_free(tmp); return ret; } +#endif /* NOTE: we scan all the pixels to have an exact information */ static int get_alpha_info_pal8(const AVPicture *src, int width, int height) |