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

[mstorsjo]

Author: mstorsjo
Date: Wed Sep 15 19:39:25 2010
New Revision: 25126

Log:
rtsp: Handle standard assigned codec names for private payload types, too

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Wed Sep 15 19:35:39 2010	(r25125)
+++ trunk/libavformat/rtsp.c	Wed Sep 15 19:39:25 2010	(r25126)
@@ -114,6 +114,12 @@ static int sdp_parse_rtpmap(AVFormatCont
                 break;
             }
         }
+        /* If no dynamic handler was found, check with the list of standard
+         * allocated types, if such a stream for some reason happens to
+         * use a private payload type. This isn't handled in rtpdec.c, since
+         * the format name from the rtpmap line never is passed into rtpdec. */
+        if (!rtsp_st->dynamic_handler)
+            codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type);
     } else {
         /* We are in a standard case
          * (from http://www.iana.org/assignments/rtp-parameters). */