diff options
| author | Martin Storsjö <martin@martin.st> | 2010-09-15 17:39:25 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-09-15 17:39:25 +0000 |
| commit | 160918d588692d250011a9ccfe025b647167a834 (patch) | |
| tree | db7543666dec2af299db93047ad7496116262590 /libavformat/rtsp.c | |
| parent | 0048a2a8d347c9a81a781f4126023018f1b29527 (diff) | |
| download | ffmpeg-160918d588692d250011a9ccfe025b647167a834.tar.gz | |
rtsp: Handle standard assigned codec names for private payload types, too
Originally committed as revision 25126 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 7c82a37e42..ab34900c64 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). */ |