From bc9eb0467a52828d6be48de5e60f042bf3b62d1f Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed, 23 Nov 2016 19:26:38 +0100
Subject: [PATCH] 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.
---
ffserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index 3007e2d1060..01f311df679 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;
}
}
--
GitLab