svn commit: r432870 - in branches/2017Q1/multimedia/ffmpeg: . files

[Jan Beich]

Author: jbeich
Date: Mon Jan 30 21:08:47 2017
New Revision: 432870
URL: https://svnweb.freebsd.org/changeset/ports/432870

Log:
  MFH: r432866
  
  multimedia/ffmpeg: backport a crashfix for FFSERVER
  
  PR:		216605
  Submitted by:	gosha-necr at yandex.ru
  Obtained from:	upstream
  Approved by:	ports-secteam blanket

Added:
  branches/2017Q1/multimedia/ffmpeg/files/patch-ffserver__config.c
     - copied unchanged from r432866, head/multimedia/ffmpeg/files/patch-ffserver__config.c
Modified:
  branches/2017Q1/multimedia/ffmpeg/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/multimedia/ffmpeg/Makefile
==============================================================================
--- branches/2017Q1/multimedia/ffmpeg/Makefile	Mon Jan 30 21:08:03 2017	(r432869)
+++ branches/2017Q1/multimedia/ffmpeg/Makefile	Mon Jan 30 21:08:47 2017	(r432870)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	3.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/

Copied: branches/2017Q1/multimedia/ffmpeg/files/patch-ffserver__config.c (from r432866, head/multimedia/ffmpeg/files/patch-ffserver__config.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/multimedia/ffmpeg/files/patch-ffserver__config.c	Mon Jan 30 21:08:47 2017	(r432870, copy of r432866, head/multimedia/ffmpeg/files/patch-ffserver__config.c)
@@ -0,0 +1,22 @@
+Author: Michael Niedermayer <michael at niedermayer.cc>
+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 <michael at niedermayer.cc>
+
+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;
+ }
+