summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorBen Widawsky2020-06-28 12:26:41 -0700
committerBen Widawsky2020-06-28 12:27:45 -0700
commit31989f9d550d60a8ffdff2054fa2dc8655c9541f (patch)
treed57944ef0f9cfbb113c9b7530245c2c0f4b1fd74 /PKGBUILD
parent6ba6d4fa936b5b6566c8fca2ff7edaf55eba80b4 (diff)
downloadaur-31989f9d550d60a8ffdff2054fa2dc8655c9541f.tar.gz
Match upstream.
Specifically: commit d4c3610f9d1b9b4626a27eaa77863d4666c2141b Author: foutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78> Date: 3 days ago upgpkg: ffmpeg 2:4.2.3-2: remove fix for MP3 start time It was reverted upstream and another fix has been added to Chromium. git-svn-id: file:///srv/repos/svn-packages/svn@390463 eb2447ed-0c53-47e4-bac8-5bc4a241df78
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD6
1 files changed, 1 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index fabfbfe95fb9..302350e78a2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
_name=ffmpeg
pkgname=ffmpeg-libfdk_aac
pkgver=4.2.3
-pkgrel=2
+pkgrel=3
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
arch=(x86_64)
@@ -112,10 +112,6 @@ pkgver() {
prepare() {
cd ffmpeg
- # lavf/mp3dec: don't adjust start time; packets are not adjusted
- # https://crbug.com/1062037
- git cherry-pick -n 460132c9980f8a1f501a1f69477bca49e1641233
-
# backport avisynthplus support
git show 6d8cddd1c67758636843f6a08295b3896c2e9ef8 -- libavformat/avisynth.c | git apply -
git show 56f59246293de417d27ea7e27cb9a7727ee579fb -- libavformat/avisynth.c | git apply -