[FFmpeg-cvslog] r23295 - trunk/ffserver.c

[mstorsjo]

Author: mstorsjo
Date: Mon May 24 22:24:39 2010
New Revision: 23295

Log:
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

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Mon May 24 22:08:02 2010	(r23294)
+++ trunk/ffserver.c	Mon May 24 22:24:39 2010	(r23295)
@@ -3697,7 +3697,7 @@ static void build_feed_streams(void)
                             ccs = ss->codec;
 #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);
                                 matches = 0;
                             } else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) {