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

Bump required version of ffms2 to 2.16

Browse source 
Originally committed to SVN as r6493.
This commit is contained in:
Thomas Goyne 2012-02-20 18:22:20 +00:00
parent 17b0d83831
commit f79e933ac9
4 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/configure.in
View file

@ -17,7 +17,7 @@ m4_define([aegisub_version_data], [aegisub_version_major.aegisub_version_minor])
# Required packages # Required packages
################### ###################
m4_define([curl_required_version], [7.18.2]) 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([fftw3_required_version], [3.3])
m4_define([fontconfig_required_version], [2.4]) m4_define([fontconfig_required_version], [2.4])
m4_define([freetype_required_version], [9.7.0]) m4_define([freetype_required_version], [9.7.0])

4
aegisub/src/audio_provider_ffmpegsource.cpp
View file

@ -142,11 +142,7 @@ void FFmpegSourceAudioProvider::LoadAudio(wxString filename) {
// warn user? // warn user?
} }
#if FFMS_VERSION >= ((2 << 24) | (14 << 16) | (1 << 8) | 0)
AudioSource = FFMS_CreateAudioSource(FileNameShort.utf8_str(), TrackNumber, Index, -1, &ErrInfo); AudioSource = FFMS_CreateAudioSource(FileNameShort.utf8_str(), TrackNumber, Index, -1, &ErrInfo);
#else
AudioSource = FFMS_CreateAudioSource(FileNameShort.utf8_str(), TrackNumber, Index, &ErrInfo);
#endif
if (!AudioSource) if (!AudioSource)
throw agi::AudioProviderOpenError(std::string("Failed to open audio track: ") + ErrInfo.Buffer, 0); throw agi::AudioProviderOpenError(std::string("Failed to open audio track: ") + ErrInfo.Buffer, 0);

5
aegisub/src/ffmpegsource_common.cpp
View file

@ -76,12 +76,7 @@ FFmpegSourceProvider::FFmpegSourceProvider()
#endif #endif
// initialize ffmpegsource // initialize ffmpegsource
// FIXME: CPU detection?
#if FFMS_VERSION >= ((2 << 24) | (14 << 16) | (0 << 8) | 0)
FFMS_Init(0, 1); FFMS_Init(0, 1);
#else
FFMS_Init(0);
#endif
} }
wxMutex FFmpegSourceProvider::CleaningInProgress; wxMutex FFmpegSourceProvider::CleaningInProgress;

4
aegisub/src/video_provider_ffmpegsource.cpp
View file

@ -181,12 +181,8 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) {
default: ColorSpace = ""; break; default: ColorSpace = ""; break;
} }
#if FFMS_VERSION >= ((2 << 24) | (15 << 16) | (3 << 8) | 0)
const int TargetFormat[] = { FFMS_GetPixFmt("bgra"), -1 }; const int TargetFormat[] = { FFMS_GetPixFmt("bgra"), -1 };
if (FFMS_SetOutputFormatV2(VideoSource, TargetFormat, Width, Height, FFMS_RESIZER_BICUBIC, &ErrInfo)) { 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); throw VideoOpenError(std::string("Failed to set output format: ") + ErrInfo.Buffer);
} }