Upgrade to FFmpeg 4.4.

diff --git a/cscript b/cscript
index 4ed5f2b2ddd8a1c25dd5fca5c552af1a067ff534..ad8249c9f5b66c493fdddd79b2ff0c24e55a02fc 100644 (file)
--- a/cscript
+++ b/cscript
@@ -381,7 +381,7 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
         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 = []
     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(('openssl', '7f29dd5'))
     if can_build_disk(target):
         deps.append(('lwext4', '9d20ec5'))

-    deps.append(('ffcmp', 'a915540'))
+    deps.append(('ffcmp', '6259cd4'))

 
     return deps
 
 
     return deps
 

diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 73e73cbad1fad5358e5b6afc80c8e03c6776ab27..655fd1437be76c52f8acf050ebea14de96fe2194 100644 (file)
--- 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()[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);

 }
 }