diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-01-31 05:03:55 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-01-31 05:03:55 +0800 |
| commit | 0564da5229a1e988af413b03920921149ec13385 (patch) | |
| tree | 245d275727790e0e516be76c2c8625c0eeddf45c /multimedia | |
| parent | 24f93ce243b493f391238c7770fdac9c7d1635be (diff) | |
| download | freebsd-ports-gnome-0564da5229a1e988af413b03920921149ec13385.tar.gz freebsd-ports-gnome-0564da5229a1e988af413b03920921149ec13385.tar.zst freebsd-ports-gnome-0564da5229a1e988af413b03920921149ec13385.zip | |
multimedia/ffmpeg: backport a crashfix for FFSERVER
PR: 216605
Submitted by: gosha-necr@yandex.ru
Obtained from: upstream
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-ffserver__config.c | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index eb8aa27233d8..b27a4408b866 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -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/ diff --git a/multimedia/ffmpeg/files/patch-ffserver__config.c b/multimedia/ffmpeg/files/patch-ffserver__config.c new file mode 100644 index 000000000000..73c8f2ca3723 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-ffserver__config.c @@ -0,0 +1,22 @@ +Author: Michael Niedermayer <michael@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@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; + } + |