Browse Source

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.
Sam Edwards 7 years ago
parent
commit
fadbcd91e5
1 changed files with 9 additions and 6 deletions
  1. 9 6
      panda/src/ffmpeg/config_ffmpeg.cxx

+ 9 - 6
panda/src/ffmpeg/config_ffmpeg.cxx

@@ -30,16 +30,19 @@ extern "C" {
   #error Buildsystem error: BUILDING_FFMPEG not defined
   #error Buildsystem error: BUILDING_FFMPEG not defined
 #endif
 #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
 #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
 #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
 #endif
 
 
 ConfigureDef(config_ffmpeg);
 ConfigureDef(config_ffmpeg);