aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-10-14 22:55:55 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-10-14 22:55:55 +0200
commit7ac4140c078d12a2227878b3dcd6ec242598b996 (patch)
tree385cd68d5f251c789d3cd7537c8005aa1bf9fa78 /libavformat
parentdbb03b8e47f905f0f7b10c3eb5ac11f9bfc793ff (diff)
parente55376a1fd5abebbb0a082aa20739d58c2260a37 (diff)
downloadffmpeg-7ac4140c078d12a2227878b3dcd6ec242598b996.tar.gz
Merge commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37'
* commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37': rtmpproto: Write correct flv packet sizes at the end of packets Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rtmpproto.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 2e33dc8fea..f0c1422ccf 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2218,7 +2218,7 @@ static int append_flv_data(RTMPContext *rt, RTMPPacket *pkt, int skip)
bytestream2_put_byte(&pbc, ts >> 24);
bytestream2_put_be24(&pbc, 0);
bytestream2_put_buffer(&pbc, data, size);
- bytestream2_put_be32(&pbc, size + 11);
+ bytestream2_put_be32(&pbc, size + RTMP_HEADER);
return 0;
}
@@ -2369,7 +2369,7 @@ static int handle_metadata(RTMPContext *rt, RTMPPacket *pkt)
bytestream_put_byte(&p, ts >> 24);
memcpy(p, next, size + 3 + 4);
p += size + 3;
- bytestream_put_be32(&p, size + 11);
+ bytestream_put_be32(&p, size + RTMP_HEADER);
next += size + 3 + 4;
}
if (p != rt->flv_data + rt->flv_size) {
@@ -2560,7 +2560,7 @@ static int inject_fake_duration_metadata(RTMPContext *rt)
// Finalise object
bytestream_put_be16(&p, 0); // Empty string
bytestream_put_byte(&p, AMF_END_OF_OBJECT);
- bytestream_put_be32(&p, 40 + 11); // size of data part (sum of all parts below)
+ bytestream_put_be32(&p, 40 + RTMP_HEADER); // size of data part (sum of all parts above)
return 0;
}