1. ffmpeg
  2. Commit 111c935980138f65a5562fd28837064e467c7e7e
Browse code

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

Originally committed as revision 23295 to svn://svn.ffmpeg.org/ffmpeg/trunk

Martin Storsjö authored on 2010/05/25 05:24:39
Showing 1 changed files
ffserver.c
History View file @ 111c935
... ... 
@@ -3697,7 +3697,7 @@ static void build_feed_streams(void)
3697 3697 
                             ccs = ss->codec;
3698 3698 
 #define CHECK_CODEC(x)  (ccf->x != ccs->x)
3699 3699
3700 
-                            if (CHECK_CODEC(codec) || CHECK_CODEC(codec_type)) {
3700 
+                            if (CHECK_CODEC(codec_id) || CHECK_CODEC(codec_type)) {
3701 3701 
                                 http_log("Codecs do not match for stream %d\n", i);
3702 3702 
                                 matches = 0;
3703 3703 
                             } else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) {