iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix FFMPEG/Provider support (PART 2) 

Originally committed to SVN as r2504.
This commit is contained in:
Amar Takhar 2008-12-16 03:18:02 +00:00
parent 07b2eeeb42
commit bcb5258d7a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.in
View File

@ -451,11 +451,6 @@ if test "$with_ffmpeg" != "no"; then
if test "$with_swscale" = "no" && test "$with_swscale_lib" = "no"; then if test "$with_swscale" = "no" && test "$with_swscale_lib" = "no"; then
with_ffmpeg="no"; with_ffmpeg="no";
fi fi
if test "$with_ffmpeg" = "yes"; then
found_video_provider="yes"
AC_DEFINE(WITH_FFMPEG, 1, [Enable FFMPEG Video Provider])
fi
fi fi
AC_SUBST(SWSCALE_LDFLAGS) AC_SUBST(SWSCALE_LDFLAGS)
@ -466,7 +461,11 @@ AC_SUBST(AVUTIL_LDFLAGS)
AC_ARG_WITH(provider-ffmpeg, [ --without-provider-ffmpeg build without FFMPEG A/V provider. (default: auto)], ffmpeg_provider_disabled="(disabled)") AC_ARG_WITH(provider-ffmpeg, [ --without-provider-ffmpeg build without FFMPEG A/V provider. (default: auto)], ffmpeg_provider_disabled="(disabled)")
AM_CONDITIONAL([HAVE_FFMPEG], [test "$with_provider_ffmpeg" = "yes"]) if test "$with_ffmpeg" = "yes"; then
found_video_provider="yes"
with_provider_ffmpeg="yes"
AC_DEFINE(WITH_FFMPEG, 1, [Enable FFMPEG Video Provider])
fi
if test "$with_ffmpeg" = "no"; then if test "$with_ffmpeg" = "no"; then
with_provider_ffmpegsource="no" with_provider_ffmpegsource="no"
@ -475,6 +474,8 @@ if test "$with_ffmpeg" = "no"; then
ffmpeg_provider_disabled="(disabled, requires FFMPEG)" ffmpeg_provider_disabled="(disabled, requires FFMPEG)"
fi fi
AM_CONDITIONAL([HAVE_FFMPEG], [test "$with_provider_ffmpeg" = "yes"])
AC_ARG_WITH(provider-ffmpegsource, [ --without-provider-ffmpegsource build without FFmpegSource A/V provider. (default: auto)], ffmpegsource_provider_disabled="(disabled)") AC_ARG_WITH(provider-ffmpegsource, [ --without-provider-ffmpegsource build without FFmpegSource A/V provider. (default: auto)], ffmpegsource_provider_disabled="(disabled)")
if test "$with_ffmpegsource" != "no"; then if test "$with_ffmpegsource" != "no"; then