From owner-svn-ports-head@freebsd.org Mon Jan 30 21:03:57 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FC44CC8C02; Mon, 30 Jan 2017 21:03:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 369C41C64; Mon, 30 Jan 2017 21:03:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0UL3uJB066501; Mon, 30 Jan 2017 21:03:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0UL3uar066499; Mon, 30 Jan 2017 21:03:56 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701302103.v0UL3uar066499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 30 Jan 2017 21:03:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432866 - in head/multimedia/ffmpeg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2017 21:03:57 -0000 Author: jbeich Date: Mon Jan 30 21:03:55 2017 New Revision: 432866 URL: https://svnweb.freebsd.org/changeset/ports/432866 Log: multimedia/ffmpeg: backport a crashfix for FFSERVER PR: 216605 Submitted by: gosha-necr@yandex.ru Obtained from: upstream Added: head/multimedia/ffmpeg/files/patch-ffserver__config.c (contents, props changed) Modified: head/multimedia/ffmpeg/Makefile (contents, props changed) Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Mon Jan 30 21:03:46 2017 (r432865) +++ head/multimedia/ffmpeg/Makefile Mon Jan 30 21:03:55 2017 (r432866) @@ -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/ Added: head/multimedia/ffmpeg/files/patch-ffserver__config.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg/files/patch-ffserver__config.c Mon Jan 30 21:03:55 2017 (r432866) @@ -0,0 +1,22 @@ +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; + } +