diff options
| author | Kamran Mackey | 2015-12-20 03:59:09 -0700 |
|---|---|---|
| committer | Kamran Mackey | 2015-12-20 03:59:09 -0700 |
| commit | 11d74dd90a930d079e82ab4c4e46e8a047fc41fe (patch) | |
| tree | 7043f3df14e2c98e1107165d4fafee230fcd8d13 | |
| parent | 5effa208dfbb5a852741369e3ae9cf9f08cdcbfb (diff) | |
| download | aur-11d74dd90a930d079e82ab4c4e46e8a047fc41fe.tar.gz | |
Removed the patch. It no longer applies.
Signed-off-by: Kamran Mackey <kamranm1200@gmail.com>
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 |
3 files changed, 5 insertions, 50 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Dec 20 10:54:51 UTC 2015 +# Sun Dec 20 10:58:28 UTC 2015 pkgbase = ffmpeg-git pkgdesc = Complete solution to record, convert and stream audio and video (git version) pkgver = r77404.70f13ab - pkgrel = 5 + pkgrel = 6 url = http://ffmpeg.org/ arch = i686 arch = x86_64 @@ -57,8 +57,6 @@ pkgbase = ffmpeg-git provides = libswscale.so conflicts = ffmpeg source = ffmpeg-git::git://github.com/ffmpeg/ffmpeg.git - source = ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch - md5sums = SKIP md5sums = SKIP pkgname = ffmpeg-git @@ -4,7 +4,7 @@ pkgname=ffmpeg-git pkgver=r77404.70f13ab -pkgrel=5 +pkgrel=6 pkgdesc="Complete solution to record, convert and stream audio and video (git version)" arch=('i686' 'x86_64') license=('GPL3') @@ -25,10 +25,8 @@ provides=( 'libswscale.so' ) conflicts=('ffmpeg') -source=("$pkgname"::'git://github.com/ffmpeg/ffmpeg.git' - ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) -md5sums=('SKIP' - 'SKIP') +source=("$pkgname"::'git://github.com/ffmpeg/ffmpeg.git') +md5sums=('SKIP') prepare() { cd "$srcdir/$pkgname" diff --git a/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch deleted file mode 100644 index 15d2600d1c47..000000000000 --- a/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 -From: James Zern <jzern@google.com> -Date: Mon, 19 Oct 2015 22:44:11 -0700 -Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings - -VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed -from libvpx and the remaining values were never used here - -Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> -Signed-off-by: James Zern <jzern@google.com> ---- - libavcodec/libvpxenc.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 5f39783..992122c 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *const ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", --- -1.7.10.4 - |