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

meson: bump minimum ffms2 version to 2.22

Browse source 
It's been out for 6 years, so this should be fairly safe. Also fix a build error that somehow snuck in during the merge
This commit is contained in:
Ryan 2021-01-16 05:07:26 -05:00
parent 6660594f64
commit 8b8f4a3925
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -174,7 +174,7 @@ foreach dep: [
['portaudio-2.0', '', 'PortAudio', []], ['portaudio-2.0', '', 'PortAudio', []],
['openal', '>=0.0.8', 'OpenAL', []], ['openal', '>=0.0.8', 'OpenAL', []],
# video # video
['ffms2', '', 'FFMS2', ['ffms2', 'ffms2_dep']], ['ffms2', '>=2.22', 'FFMS2', ['ffms2', 'ffms2_dep']],
# other # other
['fftw3', '', 'FFTW3', []], ['fftw3', '', 'FFTW3', []],
['hunspell', '', 'Hunspell', []], # needs a proper port ['hunspell', '', 'Hunspell', []], # needs a proper port

1
src/video_provider_ffmpegsource.cpp
View file

@ -267,7 +267,6 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG; CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG;
RealColorSpace = ColorSpace = colormatrix_description(CS, CR); RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
#if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && colormatrix == "TV.601") { if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && colormatrix == "TV.601") {
CS = AGI_CS_BT470BG; CS = AGI_CS_BT470BG;
ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR); ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR);