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

[rbultje]

Author: rbultje
Date: Sat Jan 10 00:36:17 2009
New Revision: 16509

Log:
Apply rtpmap: SDP lines to the last m= line only, since they generally just
come directly after each m= line if required. See "[PATCH] RTSP-MS 5-6/15:
parse only the last m= line stream per rtpmap line" thread on ML.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Fri Jan  9 23:22:40 2009	(r16508)
+++ trunk/libavformat/rtsp.c	Sat Jan 10 00:36:17 2009	(r16509)
@@ -441,17 +441,13 @@ static void sdp_parse_line(AVFormatConte
             } else {
                 av_strlcpy(rtsp_st->control_url, p,   sizeof(rtsp_st->control_url));
             }
-        } else if (av_strstart(p, "rtpmap:", &p)) {
+        } else if (av_strstart(p, "rtpmap:", &p) && s->nb_streams > 0) {
             /* NOTE: rtpmap is only supported AFTER the 'm=' tag */
             get_word(buf1, sizeof(buf1), &p);
             payload_type = atoi(buf1);
-            for(i = 0; i < s->nb_streams;i++) {
-                st = s->streams[i];
+            st = s->streams[s->nb_streams - 1];
                 rtsp_st = st->priv_data;
-                if (rtsp_st->sdp_payload_type == payload_type) {
                     sdp_parse_rtpmap(st->codec, rtsp_st, payload_type, p);
-                }
-            }
         } else if (av_strstart(p, "fmtp:", &p)) {
             /* NOTE: fmtp is only supported AFTER the 'a=rtpmap:xxx' tag */
             get_word(buf1, sizeof(buf1), &p);