]> git.sesse.net Git - ffmpeg/commitdiff
ffserver: Fix one of the codec parameter checks
authorMartin Storsjö <martin@martin.st>
Mon, 24 May 2010 20:24:39 +0000 (20:24 +0000)
committerMartin Storsjö <martin@martin.st>
Mon, 24 May 2010 20:24:39 +0000 (20:24 +0000)
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

ffserver.c

index c82c73ae34228feaf38cde2106c58c87334fc750..64eb206084972f10461329d8089f0100725c020f 100644 (file)
@@ -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)) {