summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-29 23:02:03 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-30 20:39:03 +0200
commit054ee2d2bdee16b40a0328efb0b34d464e2c075c (patch)
tree5b8edfb9d059ed973395d974dcff29c52cab3005
parente9796a45f1822916139f362803f3621347521584 (diff)
Upgrade to FFmpeg 4.4.
-rw-r--r--cscript4
m---------test/data0
-rw-r--r--test/ffmpeg_examiner_test.cc2
3 files changed, 3 insertions, 3 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
-Subproject 3596fb230c71b820ee5ced44d08d76a4ca3821d
+Subproject 1ba6c3a1d4b3b507ef868aaacf9fa0383a7f22a
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);
}