[FFmpeg-cvslog] r21741 - trunk/libavformat/rtsp.c

[rbultje]

Author: rbultje
Date: Wed Feb 10 19:30:55 2010
New Revision: 21741

Log:
Don't forget to set known audio parameters (samplerate, etc.) if the codec is
not supported in FFmpeg. This will cause crashes later because the samplerate
is used to initialize the timebase.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Wed Feb 10 18:20:50 2010	(r21740)
+++ trunk/libavformat/rtsp.c	Wed Feb 10 19:30:55 2010	(r21741)
@@ -131,9 +131,8 @@ static int sdp_parse_rtpmap(AVFormatCont
     if (c && c->name)
         c_name = c->name;
     else
-        c_name = (char *) NULL;
+        c_name = "(null)";
 
-    if (c_name) {
         get_word_sep(buf, sizeof(buf), "/", &p);
         i = atoi(buf);
         switch (codec->codec_type) {
@@ -164,9 +163,6 @@ static int sdp_parse_rtpmap(AVFormatCont
             break;
         }
         return 0;
-    }
-
-    return -1;
 }
 
 /* return the length and optionally the data */