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/imgconvert.c | |
| parent | b9b18fbdeaa364e160c5f1df164befa3dde6e833 (diff) | |
Enable swscale usage in ffmpeg
Originally committed as revision 5959 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) |