[vlc-devel] Re: [PATCH] ffmpeg sws_scaler check on configure.ac

[Christophe Mutricy]

On Thu, Mar 08, 07 at 19:37 +0200, Ilkka Ollakka wrote:
> Here's small patch to change how configure checks if sws_scaler should
> be used. Instead of checking swscale.h headerfile, it checks if swscale
> lib is usable (ffmpeg-svn install swscale.h even if swscaler ain't
> enabled). But vlc code uses that header-check, so it's added later.
> @@ -2902,7 +2902,7 @@
>       PKG_CHECK_MODULES(SWSCALE, libswscale,[
>         VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}]) 
>         VLC_ADD_LDFLAGS([ffmpeg],[${SWSCALE_LIBS}]) 
> -       AC_CHECK_HEADERS(ffmpeg/swscale.h)
> +       AC_CHECK_LIB(swscale, sws_getContext)
>         ],[ true ])
>       VLC_RESTORE_FLAGS
That's inside the PKG_CHECK so only if libswscale.pc is present. So the
header check is safe and pertinant

>      ],[
> @@ -2942,6 +2942,7 @@
>        CPPFLAGS="${CPPFLAGS_save}"
>  
>        AC_CHECK_LIB(swscale, sws_getContext, [
> +        AC_CHECK_HEADERS(ffmpeg/swscale.h)
>          VLC_ADD_LDFLAGS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL])
>        LDFLAGS="${LDFLAGS_save}"
>        CPPFLAGS="${CPPFLAGS_save}"

Applied

-- 
Xtophe

-- 
This is the vlc-devel mailing-list, see http://www.videolan.org/vlc/
To unsubscribe, please read http://developers.videolan.org/lists.html