summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg010
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2015-11-20 18:36:12 +0000
committerryoon <ryoon@pkgsrc.org>2015-11-20 18:36:12 +0000
commit73a907cc44d4c67f35953ea9bdca4c0c8a2f4101 (patch)
tree6e10b1869dc148247e661c15767f01627ed7b28a /multimedia/ffmpeg010
parenta765cb2a200b77de32d9e5e9c3da07afee3aa8e2 (diff)
downloadpkgsrc-73a907cc44d4c67f35953ea9bdca4c0c8a2f4101.tar.gz
Fix build with libvpx-1.5.0 with upstream patch
Diffstat (limited to 'multimedia/ffmpeg010')
-rw-r--r--multimedia/ffmpeg010/distinfo3
-rw-r--r--multimedia/ffmpeg010/patches/patch-libavcodec_libvpxenc.c26
2 files changed, 28 insertions, 1 deletions
diff --git a/multimedia/ffmpeg010/distinfo b/multimedia/ffmpeg010/distinfo
index b4f020cab25..1a7d5b05943 100644
--- a/multimedia/ffmpeg010/distinfo
+++ b/multimedia/ffmpeg010/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 23:54:24 agc Exp $
+$NetBSD: distinfo,v 1.14 2015/11/20 18:36:12 ryoon Exp $
SHA1 (ffmpeg-0.10.16.tar.bz2) = d0878e389a38150d7a55d86330a18770015a6ac6
RMD160 (ffmpeg-0.10.16.tar.bz2) = e264172b0852f6b35dc64b1117404f8d3579709c
@@ -9,4 +9,5 @@ SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2
SHA1 (patch-configure) = 3c275a594dc18eb60236f8a80dcd627ce4671e1a
SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24
+SHA1 (patch-libavcodec_libvpxenc.c) = 811d8bc771982123120337841f2025811af6950d
SHA1 (patch-libavformat_nutdec.c) = eb16a4d2757bfc13a745cc62fab7711897bdeb30
diff --git a/multimedia/ffmpeg010/patches/patch-libavcodec_libvpxenc.c b/multimedia/ffmpeg010/patches/patch-libavcodec_libvpxenc.c
new file mode 100644
index 00000000000..24a2ec6854d
--- /dev/null
+++ b/multimedia/ffmpeg010/patches/patch-libavcodec_libvpxenc.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-libavcodec_libvpxenc.c,v 1.1 2015/11/20 18:36:12 ryoon Exp $
+
+https://github.com/FFmpeg/FFmpeg/commit/6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab#diff-2717f08354d3468cf8024461959fcc8a
+
+--- libavcodec/libvpxenc.c.orig 2015-03-12 19:53:52.000000000 +0000
++++ libavcodec/libvpxenc.c
+@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext {
+
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *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",