From 922e7eebbd71b9330011203da20f14c99375ac00 Mon Sep 17 00:00:00 2001 From: riggs Date: Sun, 12 Feb 2017 12:01:02 +0000 Subject: Update to upstream version 3.2.4 Details: - patch-ffserver__config.c has been upstreamed - Fix two potential heap overflows in lavf/mov.c MFH: 2017Q1 Security: CVE-2017-5024 CVE-2017-5025 --- multimedia/ffmpeg/Makefile | 2 +- multimedia/ffmpeg/distinfo | 6 +++--- multimedia/ffmpeg/files/patch-ffserver__config.c | 22 ---------------------- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 multimedia/ffmpeg/files/patch-ffserver__config.c (limited to 'multimedia/ffmpeg') diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index f93a608bc7f4..39da18c0b1ec 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 3.2.3 +PORTVERSION= 3.2.4 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index c04541196039..75c883fd6be5 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486631170 -SHA256 (ffmpeg-3.2.3.tar.bz2) = e9a41be04e8a7f62f83d0ff5ecaa9c82a857f9200f61b02ef5f304a16fb9b072 -SIZE (ffmpeg-3.2.3.tar.bz2) = 9614810 +TIMESTAMP = 1486896628 +SHA256 (ffmpeg-3.2.4.tar.bz2) = c0fa3593a2e9e96ace3c1757900094437ad96d1d6ca19f057c378b5f394496a4 +SIZE (ffmpeg-3.2.4.tar.bz2) = 9612274 diff --git a/multimedia/ffmpeg/files/patch-ffserver__config.c b/multimedia/ffmpeg/files/patch-ffserver__config.c deleted file mode 100644 index 73c8f2ca3723..000000000000 --- a/multimedia/ffmpeg/files/patch-ffserver__config.c +++ /dev/null @@ -1,22 +0,0 @@ -Author: Michael Niedermayer -Date: Tue Nov 29 18:48:40 2016 +0100 - - ffserver_config: Setup codecpar in add_codec() - - fixes segfault in the status page code - - Signed-off-by: Michael Niedermayer - -https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=472fee91bcf9 - ---- ffserver_config.c.orig 2016-12-05 23:28:53 UTC -+++ ffserver_config.c -@@ -323,6 +323,8 @@ done: - av_dict_free(&recommended); - av_stream_set_recommended_encoder_configuration(st, enc_config); - st->codec = av; -+ st->codecpar = avcodec_parameters_alloc(); -+ avcodec_parameters_from_context(st->codecpar, av); - stream->streams[stream->nb_streams++] = st; - } - -- cgit