diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-23 19:26:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-27 14:07:58 +0100 |
| commit | bc9eb0467a52828d6be48de5e60f042bf3b62d1f (patch) | |
| tree | b2c8afef08348528f16bd3a7a5ff10206b5e8ed1 /ffserver.c | |
| parent | 6a4e24280dd7f15c41628ebfb01ee25661d8b258 (diff) | |
| download | ffmpeg-bc9eb0467a52828d6be48de5e60f042bf3b62d1f.tar.gz | |
Revert "ffserver: use AVStream.codecpar in open_input_stream()"
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.
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 3007e2d106..01f311df67 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2213,7 +2213,7 @@ static int open_input_stream(HTTPContext *c, const char *info) c->pts_stream_index = 0; for(i=0;i<c->stream->nb_streams;i++) { 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; } } |