diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2015-12-24 12:49:23 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2015-12-24 12:49:23 +0000 |
| commit | ba751ac7b28b05e16ba53e546f04c304579f0bac (patch) | |
| tree | 0fa8f72f735ee803caa17b4f89f8a532fcaeb643 /multimedia/mplayer | |
| parent | Update to upstream version 2.8.4 (diff) | |
Use ffmpeg 2.8.4 for mplayer / mencoder
Notes
Notes:
svn path=/head/; revision=404351
Diffstat (limited to 'multimedia/mplayer')
| -rw-r--r-- | multimedia/mplayer/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.common | 2 | ||||
| -rw-r--r-- | multimedia/mplayer/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c | 39 |
4 files changed, 4 insertions, 42 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 3fd9ac560b71..81a918eae5f3 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -3,6 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index a5f173b88e1c..c15e3b452203 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -6,7 +6,7 @@ MPLAYER_SNAPSHOT_DATE= 2015-12-19 MPLAYER_PORT_VERSION= 1.2.r${MPLAYER_SNAPSHOT_DATE:S/-//g} -FFMPEG_VERSION= 2.8.3 +FFMPEG_VERSION= 2.8.4 MASTER_SITES= LOCAL/riggs/mplayer:local \ http://ffmpeg.org/releases/:ffmpeg DISTFILES+= ffmpeg-${FFMPEG_VERSION}.tar.bz2:ffmpeg \ diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index fcaed24b76a3..4d95ebb1012e 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1,4 +1,4 @@ -SHA256 (ffmpeg-2.8.3.tar.bz2) = 1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6 -SIZE (ffmpeg-2.8.3.tar.bz2) = 8576798 +SHA256 (ffmpeg-2.8.4.tar.bz2) = 83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e +SIZE (ffmpeg-2.8.4.tar.bz2) = 8579383 SHA256 (mplayer-1.2.20151219.tar.xz) = f11d1100a1c37ec9e3e19c7698baf77871ae305ae431ec4a3dc187ca9316e4a2 SIZE (mplayer-1.2.20151219.tar.xz) = 5167716 diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c deleted file mode 100644 index 898128c286ce..000000000000 --- a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c +++ /dev/null @@ -1,39 +0,0 @@ -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", |