[FFmpeg-cvslog] ffserver: allocate AVStream's internal too

Reynaldo H. Verdejo Pinochet git at videolan.org
Tue Dec 15 19:18:06 CET 2015


ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Mon Dec 14 09:49:08 2015 -0800| [5a31f2318b8fed1f4711cb86eab6d9b679946878] | committer: Reynaldo H. Verdejo Pinochet

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 at osg.samsung.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a31f2318b8fed1f4711cb86eab6d9b679946878
---

 ffserver.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffserver.c b/ffserver.c
index 029771c..4392a62 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3423,6 +3423,7 @@ static int rtp_new_av_stream(HTTPContext *c,
 /********************************************************************/
 /* ffserver initialization */
 
+/* FIXME: This code should use avformat_new_stream() */
 static AVStream *add_av_stream1(FFServerStream *stream,
                                 AVCodecContext *codec, int copy)
 {
@@ -3448,6 +3449,7 @@ static AVStream *add_av_stream1(FFServerStream *stream,
         fst->codec = codec;
 
     fst->priv_data = av_mallocz(sizeof(FeedData));
+    fst->internal = av_mallocz(sizeof(*fst->internal));
     fst->index = stream->nb_streams;
     avpriv_set_pts_info(fst, 33, 1, 90000);
     fst->sample_aspect_ratio = codec->sample_aspect_ratio;



More information about the ffmpeg-cvslog mailing list