mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Remove support for old FFMPEG releases, if you require or want this support you are officially on your own, closes #875.

Browse source 
Originally committed to SVN as r3039.
This commit is contained in:
Amar Takhar 2009-06-10 02:21:20 +00:00
parent e2015ca7e9
commit 5cff8b2d6a
4 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/configure.in
View file

@ -618,11 +618,6 @@ AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"])
# Video / Audio Providers # Video / Audio Providers
######################### #########################
AC_ARG_ENABLE(old-ffmpeg, [ --enable-old-ffmpeg Use old FFMPEG header locations (default=no)])
if test "$enable_old_ffmpeg" = "yes"; then
AC_DEFINE([WITH_OLD_FFMPEG], [1], [Use old FFMPEG header locations])
fi
AC_ARG_WITH(ffmpeg, [ --without-ffmpeg build without FFMPEG support. AC_ARG_WITH(ffmpeg, [ --without-ffmpeg build without FFMPEG support.
Disables FFMPEG and FFmpegSource A/V providers. Disables FFMPEG and FFmpegSource A/V providers.
(default: auto)], [ffmpeg_disabled="(disabled)"; with_ffmpeg="no"]) (default: auto)], [ffmpeg_disabled="(disabled)"; with_ffmpeg="no"])

5
aegisub/src/audio_provider_lavc.h
View file

@ -52,13 +52,8 @@
*/ */
extern "C" { extern "C" {
#ifdef WITH_OLD_FFMPEG
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h>
#else
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#endif /* WITH_OLD_FFMPEG */
} }
#include "mkv_wrap.h" #include "mkv_wrap.h"
#include "lavc_file.h" #include "lavc_file.h"

5
aegisub/src/lavc_file.h
View file

@ -41,13 +41,8 @@
#endif #endif
#include <wx/filename.h> #include <wx/filename.h>
extern "C" { extern "C" {
#ifdef WITH_OLD_FFMPEG
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h>
#else
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#endif /* WITH_OLD_FFMPEG */
} }
#include "include/aegisub/aegisub.h" #include "include/aegisub/aegisub.h"

6
aegisub/src/video_provider_lavc.h
View file

@ -44,15 +44,9 @@
#endif #endif
#include <vector> #include <vector>
extern "C" { extern "C" {
#ifdef WITH_OLD_FFMPEG
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h>
#include <ffmpeg/swscale.h>
#else
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#endif /* WITH_OLD_FFMPEG */
} }
#include "include/aegisub/video_provider.h" #include "include/aegisub/video_provider.h"
#include "include/aegisub/aegisub.h" #include "include/aegisub/aegisub.h"