Use ffmpeg 2.8.4 for mplayer / mencoder

This commit is contained in:
Thomas Zander 2015-12-24 12:49:23 +00:00
parent d52b8cbe4e
commit ba751ac7b2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=404351
6 changed files with 7 additions and 44 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 1
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org

View file

@ -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

View file

@ -3,6 +3,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 1
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org

View file

@ -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 \

View file

@ -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

View file

@ -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",