diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-10 17:54:24 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-10 17:54:24 +0000 |
| commit | 13ca50f367d34a11a62ce4ae9317b0f7b2f6f81c (patch) | |
| tree | 7bcaa6c3149301628724b19e0c89437667955014 /libavcodec | |
| parent | 781138d0052d7e528ff553ef16af26c49751e4af (diff) | |
| download | ffmpeg-13ca50f367d34a11a62ce4ae9317b0f7b2f6f81c.tar.gz | |
Rename --enable-swscaler --> enable-swscale to be consistent with the
directory name and other option names. Also rename variables accordingly.
Originally committed as revision 12408 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7dd93a0bd5..a3570bd262 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -356,7 +356,7 @@ OBJS-$(HAVE_W32THREADS) += w32thread.o OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o -ifneq ($(CONFIG_SWSCALER),yes) +ifneq ($(CONFIG_SWSCALE),yes) OBJS += imgresample.o endif diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 468035f364..756c0add2a 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -2380,7 +2380,7 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, } #endif -#ifndef CONFIG_SWSCALER +#ifndef CONFIG_SWSCALE /* 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, |