From 8b8f4a39257d974ffcd91be59cc3f98cda97063f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 16 Jan 2021 05:07:26 -0500 Subject: [PATCH] meson: bump minimum ffms2 version to 2.22 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 --- meson.build | 2 +- src/video_provider_ffmpegsource.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 29d449597..5783379c8 100644 --- a/meson.build +++ b/meson.build @@ -174,7 +174,7 @@ foreach dep: [ ['portaudio-2.0', '', 'PortAudio', []], ['openal', '>=0.0.8', 'OpenAL', []], # video - ['ffms2', '', 'FFMS2', ['ffms2', 'ffms2_dep']], + ['ffms2', '>=2.22', 'FFMS2', ['ffms2', 'ffms2_dep']], # other ['fftw3', '', 'FFTW3', []], ['hunspell', '', 'Hunspell', []], # needs a proper port diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp index 7340317b1..de3304576 100644 --- a/src/video_provider_ffmpegsource.cpp +++ b/src/video_provider_ffmpegsource.cpp @@ -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; 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") { CS = AGI_CS_BT470BG; ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR);