mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 08:42:39 +00:00
rtpdec: Handle RTP header extension
This fixes roundup issue 2270. Patch by Robert Schlabbach, robert_s at gmx dot net Originally committed as revision 25372 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3ece3e4c56
commit
9446b4bbbc
@ -421,10 +421,12 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
|
||||
{
|
||||
unsigned int ssrc, h;
|
||||
int payload_type, seq, ret, flags = 0;
|
||||
int ext;
|
||||
AVStream *st;
|
||||
uint32_t timestamp;
|
||||
int rv= 0;
|
||||
|
||||
ext = buf[0] & 0x10;
|
||||
payload_type = buf[1] & 0x7f;
|
||||
if (buf[1] & 0x80)
|
||||
flags |= RTP_FLAG_MARKER;
|
||||
@ -451,6 +453,21 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
|
||||
len -= 12;
|
||||
buf += 12;
|
||||
|
||||
/* RFC 3550 Section 5.3.1 RTP Header Extension handling */
|
||||
if (ext) {
|
||||
if (len < 4)
|
||||
return -1;
|
||||
/* calculate the header extension length (stored as number
|
||||
* of 32-bit words) */
|
||||
ext = (AV_RB16(buf + 2) + 1) << 2;
|
||||
|
||||
if (len < ext)
|
||||
return -1;
|
||||
// skip past RTP header extension
|
||||
len -= ext;
|
||||
buf += ext;
|
||||
}
|
||||
|
||||
if (!st) {
|
||||
/* specific MPEG2TS demux support */
|
||||
ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len);
|
||||
|
Loading…
Reference in New Issue
Block a user