From: Carl Hetherington <cth@carlh.net>
Date: Thu, 29 Apr 2021 21:02:03 +0000 (+0200)
Subject: Upgrade to FFmpeg 4.4.
X-Git-Tag: v2.15.141~11^2~1
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5d49dbb9eb00770d9fd11c748549b7427cce21d4

Upgrade to FFmpeg 4.4.
---

diff --git a/cscript b/cscript
index 4ed5f2b2d..ad8249c9f 100644
--- a/cscript
+++ b/cscript
@@ -381,7 +381,7 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', 'e89aa4a', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
@@ -397,7 +397,7 @@ def dependencies(target, options):
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
         deps.append(('lwext4', '9d20ec5'))
-    deps.append(('ffcmp', 'a915540'))
+    deps.append(('ffcmp', '6259cd4'))
 
     return deps
 
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 73e73cbad..655fd1437 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -65,5 +65,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_probesize_test)
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->frame_rate(), 48000);
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->channels(), 2);
 	BOOST_CHECK_EQUAL (examiner->audio_streams()[1]->frame_rate(), 48000);
-	BOOST_CHECK_EQUAL (examiner->audio_streams()[1]->channels(), 6);
+	BOOST_CHECK_EQUAL (examiner->audio_streams()[1]->channels(), 5);
 }