diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-11-14 19:34:12 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-11-14 19:34:12 +0000 |
| commit | 1ad587fb06b5fac44180ece9bd8d1218551de4b0 (patch) | |
| tree | e7641fb657d8e201903d023988865a1bd3fff335 /multimedia/mplayer | |
| parent | Reset maintainership (diff) | |
multimedia/libvpx: update 1.5.0
ABI isn't compatible, so bump PORTREVISION in consumers.
Changes: https://chromium.googlesource.com/webm/libvpx/+log/e67d45d..v1.5.0
ACC report: https://people.freebsd.org/~jbeich/compat_reports/libvpx/1.4.0.488_1_to_1.5.0/compat_report.html
PR: 204478
Exp-run by: antoine
Approved by: ashish (maintainer)
Notes
Notes:
svn path=/head/; revision=401587
Diffstat (limited to 'multimedia/mplayer')
| -rw-r--r-- | multimedia/mplayer/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c | 39 |
2 files changed, 40 insertions, 1 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index e5c08970abc0..5e66dfad564c 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c new file mode 100644 index 000000000000..898128c286ce --- /dev/null +++ b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c @@ -0,0 +1,39 @@ +commit 6540fe0 +Author: James Zern <jzern@google.com> +Date: Mon Oct 19 22:44:11 2015 -0700 + + 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 ffmpeg/libavcodec/libvpxenc.c ffmpeg/libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- ffmpeg/libavcodec/libvpxenc.c ++++ ffmpeg/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", |