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

bcoudurier subversion
Thu May 29 04:28:34 CEST 2008


Author: bcoudurier
Date: Thu May 29 04:28:33 2008
New Revision: 13522

Log:
check that stream is set, fixes CID13 RUN2

Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Thu May 29 04:28:33 2008
@@ -4233,7 +4233,7 @@ static int parse_ffconfig(const char *fi
                 fprintf(stderr, "%s:%d: No corresponding <Stream> for </Stream>\n",
                         filename, line_num);
                 errors++;
-            }
+            } else {
             if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) {
                 if (audio_id != CODEC_ID_NONE) {
                     audio_enc.codec_type = CODEC_TYPE_AUDIO;
@@ -4247,6 +4247,7 @@ static int parse_ffconfig(const char *fi
                 }
             }
             stream = NULL;
+            }
         } else if (!strcasecmp(cmd, "<Redirect")) {
             /*********************************************/
             char *q;




More information about the ffmpeg-cvslog mailing list