diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 14:45:01 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 14:45:29 +0100 |
commit | 6e69bf4a7eb5e9c74f0049cdaf8ab787faa1a3a6 (patch) | |
tree | bf3f198584824355d9e678b4dbfb6a575c55e237 | |
parent | 330e892c083e21bf11235425db649a73c28fed99 (diff) | |
parent | 024e5a2d5ff8a94adce48abb15ce2fb471f9d18e (diff) | |
download | ffmpeg-6e69bf4a7eb5e9c74f0049cdaf8ab787faa1a3a6.tar.gz |
Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'
* commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e':
rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/rtmppkt.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c index 4f79487ee0..c474fb3d58 100644 --- a/libavformat/rtmppkt.c +++ b/libavformat/rtmppkt.c @@ -387,6 +387,13 @@ int ff_rtmp_packet_write(URLContext *h, RTMPPacket *pkt, if ((ret = ffurl_write(h, &marker, 1)) < 0) return ret; written++; + if (pkt->ts_field == 0xFFFFFF) { + uint8_t ts_header[4]; + AV_WB32(ts_header, timestamp); + if ((ret = ffurl_write(h, ts_header, 4)) < 0) + return ret; + written += 4; + } } } return written; |