From f79e933ac9d0efc55931cab5af6c1fdf3a53f2ee Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 20 Feb 2012 18:22:20 +0000 Subject: [PATCH] Bump required version of ffms2 to 2.16 Originally committed to SVN as r6493. --- aegisub/configure.in | 2 +- aegisub/src/audio_provider_ffmpegsource.cpp | 4 ---- aegisub/src/ffmpegsource_common.cpp | 5 ----- aegisub/src/video_provider_ffmpegsource.cpp | 4 ---- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/aegisub/configure.in b/aegisub/configure.in index 0bc7d5bde..5d8074ef8 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -17,7 +17,7 @@ m4_define([aegisub_version_data], [aegisub_version_major.aegisub_version_minor]) # Required packages ################### m4_define([curl_required_version], [7.18.2]) -m4_define([ffms2_required_version], [2.15]) +m4_define([ffms2_required_version], [2.16]) m4_define([fftw3_required_version], [3.3]) m4_define([fontconfig_required_version], [2.4]) m4_define([freetype_required_version], [9.7.0]) diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp index 28842d29a..0d1e4140b 100644 --- a/aegisub/src/audio_provider_ffmpegsource.cpp +++ b/aegisub/src/audio_provider_ffmpegsource.cpp @@ -142,11 +142,7 @@ void FFmpegSourceAudioProvider::LoadAudio(wxString filename) { // warn user? } -#if FFMS_VERSION >= ((2 << 24) | (14 << 16) | (1 << 8) | 0) AudioSource = FFMS_CreateAudioSource(FileNameShort.utf8_str(), TrackNumber, Index, -1, &ErrInfo); -#else - AudioSource = FFMS_CreateAudioSource(FileNameShort.utf8_str(), TrackNumber, Index, &ErrInfo); -#endif if (!AudioSource) throw agi::AudioProviderOpenError(std::string("Failed to open audio track: ") + ErrInfo.Buffer, 0); diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp index c05b70ca6..44080c42d 100644 --- a/aegisub/src/ffmpegsource_common.cpp +++ b/aegisub/src/ffmpegsource_common.cpp @@ -76,12 +76,7 @@ FFmpegSourceProvider::FFmpegSourceProvider() #endif // initialize ffmpegsource - // FIXME: CPU detection? -#if FFMS_VERSION >= ((2 << 24) | (14 << 16) | (0 << 8) | 0) FFMS_Init(0, 1); -#else - FFMS_Init(0); -#endif } wxMutex FFmpegSourceProvider::CleaningInProgress; diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 1c076e299..966291254 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -181,12 +181,8 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) { default: ColorSpace = ""; break; } -#if FFMS_VERSION >= ((2 << 24) | (15 << 16) | (3 << 8) | 0) const int TargetFormat[] = { FFMS_GetPixFmt("bgra"), -1 }; if (FFMS_SetOutputFormatV2(VideoSource, TargetFormat, Width, Height, FFMS_RESIZER_BICUBIC, &ErrInfo)) { -#else - if (FFMS_SetOutputFormatV(VideoSource, 1LL << FFMS_GetPixFmt("bgra"), Width, Height, FFMS_RESIZER_BICUBIC, &ErrInfo)) { -#endif throw VideoOpenError(std::string("Failed to set output format: ") + ErrInfo.Buffer); }