diff options
author | Mike Williams <mike@mikebwilliams.com> | 2011-05-18 19:03:10 +0400 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2011-05-26 14:57:59 +0400 |
commit | db3262b700092e4012ae7564aa29eba1624a398c (patch) | |
tree | 5c7a1df7bb098c02d67052c2dd36b20c2150fc82 /ffmpeg.c | |
parent | 2341c97e8d737876693fc1e0ecfe7f9f6d2b7c57 (diff) |
ffserver: Fix a null pointer dereference as a result of the FF_API_MAX_STREAMS cleanup.
Fixed another dereference in the RTSP code.
Removed a useless variable.
Changed an unnecessary looping assignment to a simple assignment suggested by
Maksym.
Added fixes and tweaks suggested by Maksym Veremeyenko [verem@m1stereo.tv] and
Clément B.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -673,6 +673,7 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename) return err; /* copy stream format */ s->nb_streams = 0; + s->streams = av_mallocz(sizeof(AVStream *) * ic->nb_streams); for(i=0;i<ic->nb_streams;i++) { AVStream *st; AVCodec *codec; |