[SCM] libav/experimental: rtsp: Handle standard assigned codec names for private payload types, too

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 160918d588692d250011a9ccfe025b647167a834
Author: Martin Storsjö <martin at martin.st>
Date:   Wed Sep 15 17:39:25 2010 +0000

    rtsp: Handle standard assigned codec names for private payload types, too
    
    Originally committed as revision 25126 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 7c82a37..ab34900 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -114,6 +114,12 @@ static int sdp_parse_rtpmap(AVFormatContext *s,
                 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). */

-- 
Libav/FFmpeg packaging