mirror of https://git.ffmpeg.org/ffmpeg.git
ffserver: allocate AVStream's internal too
Avoids segfault at init_muxer() (mux.c) due to a null pointer dereference on the recently introduced AVStream->internal Fixes: #5059 (https://trac.ffmpeg.org/ticket/5059) Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
This commit is contained in:
parent
4469e8ebb2
commit
5a31f2318b
|
@ -3423,6 +3423,7 @@ static int rtp_new_av_stream(HTTPContext *c,
|
||||||
/********************************************************************/
|
/********************************************************************/
|
||||||
/* ffserver initialization */
|
/* ffserver initialization */
|
||||||
|
|
||||||
|
/* FIXME: This code should use avformat_new_stream() */
|
||||||
static AVStream *add_av_stream1(FFServerStream *stream,
|
static AVStream *add_av_stream1(FFServerStream *stream,
|
||||||
AVCodecContext *codec, int copy)
|
AVCodecContext *codec, int copy)
|
||||||
{
|
{
|
||||||
|
@ -3448,6 +3449,7 @@ static AVStream *add_av_stream1(FFServerStream *stream,
|
||||||
fst->codec = codec;
|
fst->codec = codec;
|
||||||
|
|
||||||
fst->priv_data = av_mallocz(sizeof(FeedData));
|
fst->priv_data = av_mallocz(sizeof(FeedData));
|
||||||
|
fst->internal = av_mallocz(sizeof(*fst->internal));
|
||||||
fst->index = stream->nb_streams;
|
fst->index = stream->nb_streams;
|
||||||
avpriv_set_pts_info(fst, 33, 1, 90000);
|
avpriv_set_pts_info(fst, 33, 1, 90000);
|
||||||
fst->sample_aspect_ratio = codec->sample_aspect_ratio;
|
fst->sample_aspect_ratio = codec->sample_aspect_ratio;
|
||||||
|
|
Loading…
Reference in New Issue