From fadbcd91e5f77019d9ec3e346247e3c8ded46f87 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sat, 31 Mar 2018 05:22:04 -0600 Subject: [PATCH] ffmpeg: Bump supported minimums lower for libav 9.20 We need to support this because Ubuntu 14.04 ships with this version, and has no "backports" option to bring in a newer version (without use of a PPA or compiling it yourself). We can consider raising the minimums again once Trusty is EOL. --- panda/src/ffmpeg/config_ffmpeg.cxx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/panda/src/ffmpeg/config_ffmpeg.cxx b/panda/src/ffmpeg/config_ffmpeg.cxx index be788eb2f8..850cf62937 100644 --- a/panda/src/ffmpeg/config_ffmpeg.cxx +++ b/panda/src/ffmpeg/config_ffmpeg.cxx @@ -30,16 +30,19 @@ extern "C" { #error Buildsystem error: BUILDING_FFMPEG not defined #endif -#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 86, 100) - #error Minimum supported version of libavcodec is 54.86.100. +// Minimum supported versions: +// FFmpeg: 1.1 +// libav: 9.20 (for Ubuntu 14.04) +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 35, 1) + #error Minimum supported version of libavcodec is 54.35.1. #endif -#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 59, 106) - #error Minimum supported version of libavformat is 54.59.106. +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 20, 4) + #error Minimum supported version of libavformat is 54.20.4. #endif -#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 13, 100) - #error Minimum supported version of libavutil is 52.13.100. +#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 3, 0) + #error Minimum supported version of libavutil is 52.3.0. #endif ConfigureDef(config_ffmpeg);