mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

The swscale check was enabling ffmpeg without checking if ffmpeg had been

Browse source 
detected or not.  This reworks how ffmpeg is detected and it is now _disabled_
if swscale does not exist.  Also fix some nearby style issues.

Originally committed to SVN as r2192.
This commit is contained in:
Amar Takhar 2008-05-14 15:15:52 +00:00
parent 4e334cb1d1
commit b9e9ab7906
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
configure.in
View file

@ -405,11 +405,11 @@ fi
AC_ARG_WITH(ffmpeg, [ --without-ffmpeg build without FFMPEG video provider. (default: auto)], ffmpeg_disabled="(disabled)") AC_ARG_WITH(ffmpeg, [ --without-ffmpeg build without FFMPEG video provider. (default: auto)], ffmpeg_disabled="(disabled)")
if test "$with_ffmpeg" != "no"; then if test "$with_ffmpeg" != "no"; then
AC_CHECK_LIB([avcodec], [avcodec_init],AVCODEC_LDFLAGS="-lavcodec", [with_ffmpeg=no]) AC_CHECK_LIB([avcodec], [avcodec_init],[AVCODEC_LDFLAGS="-lavcodec"; with_ffmpeg="yes"], [with_ffmpeg="no"])
AC_CHECK_LIB([avformat], [av_read_frame],AVFORMAT_LDFLAGS="-lavformat", [with_ffmpeg=no]) AC_CHECK_LIB([avformat], [av_read_frame],[AVFORMAT_LDFLAGS="-lavformat"; with_ffmpeg="yes"], [with_ffmpeg="no"])
if test "$build_darwin" = "yes"; then if test "$build_darwin" = "yes"; then
AC_CHECK_LIB([avutil], [av_free],[AVUTIL_LDFLAGS="-lavutil"], [with_ffmpeg="no"]) AC_CHECK_LIB([avutil], [av_free],[AVUTIL_LDFLAGS="-lavutil"; with_ffmpeg="yes"], [with_ffmpeg="no"])
fi fi
AC_CHECK_LIB([avformat], [sws_scale],[with_swscale="yes"], [with_swscale="no"]) AC_CHECK_LIB([avformat], [sws_scale],[with_swscale="yes"], [with_swscale="no"])
@ -417,15 +417,12 @@ if test "$with_ffmpeg" != "no"; then
AC_CHECK_LIB([swscale], [sws_scale],[SWSCALE_LDFLAGS="-lswscale"; with_swscale_lib="yes"], [with_swscale_lib="no"]) AC_CHECK_LIB([swscale], [sws_scale],[SWSCALE_LDFLAGS="-lswscale"; with_swscale_lib="yes"], [with_swscale_lib="no"])
fi fi
if test "$with_swscale" = "yes" || test "$with_swscale_lib" = "yes"; then if test "$with_swscale" = "no" && test "$with_swscale_lib" = "no"; then
with_ffmpeg="yes";
else
with_ffmpeg="no"; with_ffmpeg="no";
fi fi
if test "$with_ffmpeg" = "yes"; then if test "$with_ffmpeg" = "yes"; then
found_video_provider=yes found_video_provider="yes"
with_ffmpeg="yes"
AC_DEFINE(WITH_FFMPEG, 1, [Enable FFMPEG Video Provider]) AC_DEFINE(WITH_FFMPEG, 1, [Enable FFMPEG Video Provider])
fi fi
fi fi