From e6b244a3b986e513779aec83beab4fb25a130aa2 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Tue, 1 Dec 2009 16:08:44 +0000 Subject: Full-header RTMP packets contain real timestamp, others contain timestamp difference, so make all read packets store absolute timestamp. As a consequence, we don't need to track audio/video timestamps separately any longer in protocol handler. Originally committed as revision 20685 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtmppkt.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavformat/rtmppkt.c') diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c index 6c2e2f5b37..37846e3cea 100644 --- a/libavformat/rtmppkt.c +++ b/libavformat/rtmppkt.c @@ -116,6 +116,8 @@ int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p, return AVERROR(EIO); timestamp = AV_RB32(buf); } + if (hdr != RTMP_PS_TWELVEBYTES) + timestamp += prev_pkt[channel_id].timestamp; } if (ff_rtmp_packet_create(p, channel_id, type, timestamp, data_size)) return -1; -- cgit v1.2.3