diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:56:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:57:08 +0100 |
| commit | ac6e074fb711468a2ff3f241a1641dc5b34b386d (patch) | |
| tree | 3bf8ed5dfef4709e9a0112628f54dc5673892fe0 /libavformat/rtpdec.c | |
| parent | 56ca871fb3d6c60a97ac678a919d8253fcb3ebdd (diff) | |
| parent | ed79093222ceb42f0c3a39095a69af0b32be5450 (diff) | |
| download | ffmpeg-ac6e074fb711468a2ff3f241a1641dc5b34b386d.tar.gz | |
Merge commit 'ed79093222ceb42f0c3a39095a69af0b32be5450'
* commit 'ed79093222ceb42f0c3a39095a69af0b32be5450':
rtpdec: Add a terminating null byte at the end of the SDES/CNAME
yuv4mpeg: do not use deprecated functions
oggdec: fix faulty cleanup prototype
idcin: return 0 from idcin_read_packet() on success.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.c')
| -rw-r--r-- | libavformat/rtpdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 6079d9a226..13ad4aa127 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -307,13 +307,14 @@ int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, avio_w8(pb, (RTP_VERSION << 6) + 1); /* 1 report block */ avio_w8(pb, RTCP_SDES); len = strlen(s->hostname); - avio_wb16(pb, (6 + len + 3) / 4); /* length in words - 1 */ + avio_wb16(pb, (7 + len + 3) / 4); /* length in words - 1 */ avio_wb32(pb, s->ssrc + 1); avio_w8(pb, 0x01); avio_w8(pb, len); avio_write(pb, s->hostname, len); + avio_w8(pb, 0); /* END */ // padding - for (len = (6 + len) % 4; len % 4; len++) + for (len = (7 + len) % 4; len % 4; len++) avio_w8(pb, 0); avio_flush(pb); |