summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2016-05-27 13:50:02 -0600
committerJohn Stebbins <[email protected]>2016-05-27 13:53:16 -0600
commit3cf696625766bfd2016c9df625e14cbf6342de47 (patch)
tree23026f7be921b5fbaf3c849dc28914e287a2c509 /contrib/ffmpeg
parentfe32414aef3a21fc7f42b38cc1f8eea8a62476a3 (diff)
libvpx: bump to 1.5.0
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/A15-vp9.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/contrib/ffmpeg/A15-vp9.patch b/contrib/ffmpeg/A15-vp9.patch
new file mode 100644
index 000000000..77946b2b0
--- /dev/null
+++ b/contrib/ffmpeg/A15-vp9.patch
@@ -0,0 +1,27 @@
+diff -ur libav-11.3.orig/libavcodec/libvpxenc.c libav-11.3/libavcodec/libvpxenc.c
+--- libav-11.3.orig/libavcodec/libvpxenc.c 2015-03-08 19:54:09.000000000 -0600
++++ libav-11.3/libavcodec/libvpxenc.c 2016-05-27 13:36:07.379025868 -0600
+@@ -70,9 +70,6 @@
+
+ /** 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",
+@@ -345,8 +342,11 @@
+ codecctl_int(avctx, VP8E_SET_ARNR_STRENGTH, ctx->arnr_strength);
+ if (ctx->arnr_type >= 0)
+ codecctl_int(avctx, VP8E_SET_ARNR_TYPE, ctx->arnr_type);
+- codecctl_int(avctx, VP8E_SET_NOISE_SENSITIVITY, avctx->noise_reduction);
+- codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS, av_log2(avctx->slices));
++
++ if (CONFIG_LIBVPX_VP8_ENCODER && iface == &vpx_codec_vp8_cx_algo) {
++ codecctl_int(avctx, VP8E_SET_NOISE_SENSITIVITY, avctx->noise_reduction);
++ codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS, av_log2(avctx->slices));
++ }
+ codecctl_int(avctx, VP8E_SET_STATIC_THRESHOLD, avctx->mb_threshold);
+ codecctl_int(avctx, VP8E_SET_CQ_LEVEL, ctx->crf);
+