From fc09b128b640101f4d9332c1c406cd845eb1fca3 Mon Sep 17 00:00:00 2001 From: kkostiuk <kateryna.kostiuk@savoirfairelinux.com> Date: Thu, 25 Feb 2021 11:15:55 -0500 Subject: [PATCH] contrib: bump ffmpeg on iOS and macOS Change-Id: I6cc29ad13e50cd5c58976bdc99e5deee68c3720c --- contrib/src/ffmpeg/SHA512SUMS | 3 +-- contrib/src/ffmpeg/rules.mak | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/contrib/src/ffmpeg/SHA512SUMS b/contrib/src/ffmpeg/SHA512SUMS index e99f69fdb1..5908c2cbaa 100644 --- a/contrib/src/ffmpeg/SHA512SUMS +++ b/contrib/src/ffmpeg/SHA512SUMS @@ -1,2 +1 @@ -2c2e32ea0bd483a7c8dc3bb7dffa93419defd1d7be3724fe51e981bc13f5ee00f5d93d5d07c1fe62e944493c2319048ec2546bead50af89da3d6b2a67f3008ee ffmpeg-9f38fac053010205806ece11e6aea9b7d3bde041.tar.gz -df0393b9dbee05f64f80ff98512ec153c78ccca9f8ea170301703cd0b92fb68c91c8113ab8a2ecb161ac465544edefe29dd1965e6959694f8728fee529606665 ffmpeg-n4.2.2.tar.gz \ No newline at end of file +2c2e32ea0bd483a7c8dc3bb7dffa93419defd1d7be3724fe51e981bc13f5ee00f5d93d5d07c1fe62e944493c2319048ec2546bead50af89da3d6b2a67f3008ee ffmpeg-9f38fac053010205806ece11e6aea9b7d3bde041.tar.gz \ No newline at end of file diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 505cef935f..d82e60242f 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -1,8 +1,4 @@ -ifdef HAVE_DARWIN_OS -FFMPEG_HASH := n4.2.2 -else FFMPEG_HASH := 9f38fac053010205806ece11e6aea9b7d3bde041 -endif FFMPEG_URL := https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/$(FFMPEG_HASH).tar.gz PKGS+=ffmpeg -- GitLab