diff -Nru mythtv-0.27.1+fixes.20140624.aa822f5/debian/changelog mythtv-0.27.1+fixes.20140624.aa822f5/debian/changelog --- mythtv-0.27.1+fixes.20140624.aa822f5/debian/changelog 2016-01-07 01:05:30.000000000 +0000 +++ mythtv-0.27.1+fixes.20140624.aa822f5/debian/changelog 2016-01-07 15:45:54.000000000 +0000 @@ -1,3 +1,10 @@ +mythtv (2:0.27.1+fixes.20140624.aa822f5-0ubuntu9) xenial; urgency=medium + + * Remove some unused control mappings from libvpxenc which are no longer + available in libvpx3. + + -- Colin Watson Thu, 07 Jan 2016 15:45:53 +0000 + mythtv (2:0.27.1+fixes.20140624.aa822f5-0ubuntu8) xenial; urgency=medium * Rebuild against libvpx3. diff -Nru mythtv-0.27.1+fixes.20140624.aa822f5/debian/patches/remove-unused-vp8-controls.patch mythtv-0.27.1+fixes.20140624.aa822f5/debian/patches/remove-unused-vp8-controls.patch --- mythtv-0.27.1+fixes.20140624.aa822f5/debian/patches/remove-unused-vp8-controls.patch 1970-01-01 00:00:00.000000000 +0000 +++ mythtv-0.27.1+fixes.20140624.aa822f5/debian/patches/remove-unused-vp8-controls.patch 2016-01-07 15:45:05.000000000 +0000 @@ -0,0 +1,22 @@ +Description: libvpxenc: remove some unused control id mappings + Based on + https://github.com/FFmpeg/FFmpeg/commit/4d05e9392f84702e3c833efa86e84c7f1cf5f612, + though reduced. +Author: Colin Watson +Forwarded: no +Last-Update: 2016-01-07 + +Index: b/mythtv/external/FFmpeg/libavcodec/libvpxenc.c +=================================================================== +--- a/mythtv/external/FFmpeg/libavcodec/libvpxenc.c ++++ b/mythtv/external/FFmpeg/libavcodec/libvpxenc.c +@@ -87,9 +87,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", diff -Nru mythtv-0.27.1+fixes.20140624.aa822f5/debian/patches/series mythtv-0.27.1+fixes.20140624.aa822f5/debian/patches/series --- mythtv-0.27.1+fixes.20140624.aa822f5/debian/patches/series 2014-07-31 03:03:40.000000000 +0000 +++ mythtv-0.27.1+fixes.20140624.aa822f5/debian/patches/series 2016-01-07 15:45:21.000000000 +0000 @@ -9,3 +9,4 @@ configure_mythplugins_without_mythtv_installed.patch avoid_bswap_conflict.patch ppc64el-abiv2.patch +remove-unused-vp8-controls.patch