From 054ee2d2bdee16b40a0328efb0b34d464e2c075c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 29 Apr 2021 23:02:03 +0200 Subject: Upgrade to FFmpeg 4.4. --- cscript | 4 ++-- test/data | 2 +- test/ffmpeg_examiner_test.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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/data b/test/data index 3596fb230..1ba6c3a1d 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit 3596fb230c71b820ee5ced44d08d76a4ca3821d1 +Subproject commit 1ba6c3a1d4b3b507ef868aaacf9fa0383a7f22a9 diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc index 9c3311719..674bb6157 100644 --- a/test/ffmpeg_examiner_test.cc +++ b/test/ffmpeg_examiner_test.cc @@ -59,5 +59,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); } -- cgit v1.2.3