Commit 4e833266 authored by mstorsjo's avatar mstorsjo

ffserver: Fix one of the codec parameter checks

This is probably what was originally intended; the codec pointers are all NULL.

Fix by Howard Chu, hyc at highlandsun dot com


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23295 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent cae10b1b
...@@ -3697,7 +3697,7 @@ static void build_feed_streams(void) ...@@ -3697,7 +3697,7 @@ static void build_feed_streams(void)
ccs = ss->codec; ccs = ss->codec;
#define CHECK_CODEC(x) (ccf->x != ccs->x) #define CHECK_CODEC(x) (ccf->x != ccs->x)
if (CHECK_CODEC(codec) || CHECK_CODEC(codec_type)) { if (CHECK_CODEC(codec_id) || CHECK_CODEC(codec_type)) {
http_log("Codecs do not match for stream %d\n", i); http_log("Codecs do not match for stream %d\n", i);
matches = 0; matches = 0;
} else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) { } else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment