svn commit: r455049 - in branches/2017Q4/multimedia/ffmpeg: . files

[Jan Beich]

Author: jbeich
Date: Tue Nov 28 15:53:09 2017
New Revision: 455049
URL: https://svnweb.freebsd.org/changeset/ports/455049

Log:
  MFH: r455047
  
  multimedia/ffmpeg: fix DoS in VC-2 encoder
  
  Reported by:	Vladimir Krstulja
  Obtained from:	upstream (release/3.3 branch)
  Security:	CVE-2017-16840
  Approved by:	ports-secteam blanket

Added:
  branches/2017Q4/multimedia/ffmpeg/files/patch-CVE-2017-16840
     - copied, changed from r455047, head/multimedia/ffmpeg/files/patch-CVE-2017-16840
Modified:
  branches/2017Q4/multimedia/ffmpeg/Makefile
Directory Properties:
  branches/2017Q4/   (props changed)

Modified: branches/2017Q4/multimedia/ffmpeg/Makefile
==============================================================================
--- branches/2017Q4/multimedia/ffmpeg/Makefile	Tue Nov 28 15:52:13 2017	(r455048)
+++ branches/2017Q4/multimedia/ffmpeg/Makefile	Tue Nov 28 15:53:09 2017	(r455049)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	3.3.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/

Copied and modified: branches/2017Q4/multimedia/ffmpeg/files/patch-CVE-2017-16840 (from r455047, head/multimedia/ffmpeg/files/patch-CVE-2017-16840)
==============================================================================
--- head/multimedia/ffmpeg/files/patch-CVE-2017-16840	Tue Nov 28 15:47:09 2017	(r455047, copy source)
+++ branches/2017Q4/multimedia/ffmpeg/files/patch-CVE-2017-16840	Tue Nov 28 15:53:09 2017	(r455049)
@@ -1,4 +1,4 @@
-commit a94cb36ab2ad99d3a1331c9f91831ef593d94f74
+commit a7aac19933a91e22d77b0b4dd4ecd61edf52d43f
 Author: Rostislav Pehlivanov <atomnuker at gmail.com>
 Date:   Wed Nov 8 23:50:04 2017 +0000
 
@@ -18,7 +18,7 @@ Date:   Wed Nov 8 23:50:04 2017 +0000
     Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>
     (cherry picked from commit 3228ac730c11eca49d5680d5550128e397061c85)
 
---- libavcodec/vc2enc.c.orig	2017-10-15 15:59:37 UTC
+--- libavcodec/vc2enc.c.orig	2017-10-26 19:03:03 UTC
 +++ libavcodec/vc2enc.c
 @@ -1190,7 +1190,8 @@ static av_cold int vc2_encode_init(AVCodecContext *avc
          /* DWT init */