diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-11-20 18:36:12 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-11-20 18:36:12 +0000 |
| commit | 73a907cc44d4c67f35953ea9bdca4c0c8a2f4101 (patch) | |
| tree | 6e10b1869dc148247e661c15767f01627ed7b28a /multimedia/ffmpeg1 | |
| parent | a765cb2a200b77de32d9e5e9c3da07afee3aa8e2 (diff) | |
| download | pkgsrc-73a907cc44d4c67f35953ea9bdca4c0c8a2f4101.tar.gz | |
Fix build with libvpx-1.5.0 with upstream patch
Diffstat (limited to 'multimedia/ffmpeg1')
| -rw-r--r-- | multimedia/ffmpeg1/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg1/patches/patch-libavcodec_libvpxenc.c | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/multimedia/ffmpeg1/distinfo b/multimedia/ffmpeg1/distinfo index 967a655e4f1..20368adc27d 100644 --- a/multimedia/ffmpeg1/distinfo +++ b/multimedia/ffmpeg1/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 23:54:24 agc Exp $ +$NetBSD: distinfo,v 1.9 2015/11/20 18:36:12 ryoon Exp $ SHA1 (ffmpeg-1.2.12.tar.bz2) = ae7328442046f2c92e7909e66e91034e8072c78b RMD160 (ffmpeg-1.2.12.tar.bz2) = 38fd1f46a516310e80a7ea22ae09ef6968864d6f @@ -8,4 +8,5 @@ SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14 +SHA1 (patch-libavcodec_libvpxenc.c) = e6a0b2cde16952ee0e00521898ae85119b7dcb66 SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a diff --git a/multimedia/ffmpeg1/patches/patch-libavcodec_libvpxenc.c b/multimedia/ffmpeg1/patches/patch-libavcodec_libvpxenc.c new file mode 100644 index 00000000000..df7191d5d37 --- /dev/null +++ b/multimedia/ffmpeg1/patches/patch-libavcodec_libvpxenc.c @@ -0,0 +1,24 @@ +$NetBSD: patch-libavcodec_libvpxenc.c,v 1.1 2015/11/20 18:36:12 ryoon Exp $ + +--- libavcodec/libvpxenc.c.orig 2015-02-12 14:38:18.000000000 +0000 ++++ libavcodec/libvpxenc.c +@@ -87,19 +87,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", |