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

Chase r3148 and r3149 and remove the FFMPEG video provider from the unix build system. Updates #921.

Browse source 
Originally committed to SVN as r3150.
This commit is contained in:
Amar Takhar 2009-07-16 19:16:31 +00:00
parent cdc69b847f
commit fb8196dcf8
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
aegisub/configure.in
View file

@ -636,19 +636,6 @@ AC_SUBST(LIBSWSCALE_CFLAGS)
AC_SUBST(LIBAVUTIL_LIBS) AC_SUBST(LIBAVUTIL_LIBS)
AC_SUBST(LIBAVUTIL_CFLAGS) AC_SUBST(LIBAVUTIL_CFLAGS)
AC_ARG_WITH(provider-ffmpeg, [ --with-provider-ffmpeg
build with FFMPEG A/V provider. (default: no)]", [with_provider_ffmpeg="yes"])
if test "$agi_cv_with_ffmpeg" = "yes" && test "$with_provider_ffmpeg" = "yes"; then
found_video_provider="yes"
AC_DEFINE(WITH_FFMPEG, 1, [Enable FFMPEG Video Provider])
else
with_provider_ffmpeg="no"
fi
AM_CONDITIONAL([HAVE_PROVIDER_FFMPEG], [test "$with_provider_ffmpeg" = "yes"])
AC_ARG_WITH(provider-ffmpegsource, [ --without-provider-ffmpegsource AC_ARG_WITH(provider-ffmpegsource, [ --without-provider-ffmpegsource
build without FFmpegSource A/V provider. build without FFmpegSource A/V provider.
(default: auto)], ffmpegsource_provider_disabled="(disabled)", with_provider_ffmpegsource="yes") (default: auto)], ffmpegsource_provider_disabled="(disabled)", with_provider_ffmpegsource="yes")
@ -1369,7 +1356,6 @@ A/V Support
(required for video providers) (required for video providers)
A/V Providers A/V Providers
FFMPEG: $with_provider_ffmpeg (deprecated)
FFmpegSource: $with_provider_ffmpegsource $ffmpegsource_provider_disabled FFmpegSource: $with_provider_ffmpegsource $ffmpegsource_provider_disabled
Subtitle Providers: Subtitle Providers:

7
aegisub/src/Makefile.am
View file

@ -70,13 +70,6 @@ if HAVE_FFMPEG
aegisub_2_1_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ aegisub_2_1_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
endif endif
if HAVE_PROVIDER_FFMPEG
noinst_LIBRARIES += libaudiovideo_ffmpeg.a
libaudiovideo_ffmpeg_a_SOURCES = audio_provider_lavc.cpp lavc_file.cpp video_provider_lavc.cpp lavc_keyframes.cpp
libaudiovideo_ffmpeg_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@
aegisub_2_1_LDADD += libaudiovideo_ffmpeg.a
endif
if HAVE_PROVIDER_FFMPEGSOURCE if HAVE_PROVIDER_FFMPEGSOURCE
noinst_LIBRARIES += libaudiovideo_ffmpegsource.a noinst_LIBRARIES += libaudiovideo_ffmpegsource.a
libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp