[FFmpeg-devel] [PATCH] make img_convert symbol conditional on lavc version, not libswscale

[Diego Biurrun]

Currently we declare img_convert() in avcodec.h conditional to

#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)

However, in imgconvert.c, img_convert is defined conditional to

#ifndef CONFIG_SWSCALE

so that img_convert() is not available when compiling with swscale
enabled although it is declared in avcodec.h.

Here is a patch to change the condition in imgconvert.c, which I believe
is the correct solution.

For reference, I stumbled over this when looking that the following two
patches applied to FFmpeg by Mandriva and Debian:

http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/ffmpeg/current/SOURCES/ffmpeg-reenable-imgresample.patch?revision=207573&view=markup
http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/015_dont_provide_img_convert_in_avcodec_h.diff?op=file&rev=0&sc=0

and the associated Debian bug report:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483960&repeatmerged=yes

Diego
-------------- next part --------------
A non-text attachment was scrubbed...
Name: imgconvert.diff
Type: text/x-diff
Size: 746 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080603/9f486137/attachment.diff>