har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ffserver: use AVStream.codecpar in open_input_stream()"

Browse Source 
Fixes null pointer dereference

Testcase is simply a ffmpeg instance sending a stream to ffserver while another ffmpeg reads from it

This reverts commit 6f0a1710d77dde0d803861506a2157a23f08c14c.
This commit is contained in:
Michael Niedermayer 2016-11-23 19:26:38 +01:00
parent 6a4e24280d
commit bc9eb0467a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffserver.c
View File

@ -2213,7 +2213,7 @@ static int open_input_stream(HTTPContext *c, const char *info)
c->pts_stream_index = 0; c->pts_stream_index = 0;
for(i=0;i<c->stream->nb_streams;i++) { for(i=0;i<c->stream->nb_streams;i++) {
if (c->pts_stream_index == 0 && if (c->pts_stream_index == 0 &&
c->stream->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { c->stream->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
c->pts_stream_index = i; c->pts_stream_index = i;
} }
} }