RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37' 

* commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37':
  rtmpproto: Write correct flv packet sizes at the end of packets

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-14 22:55:55 +02:00
parent dbb03b8e47 e55376a1fd
commit 7ac4140c07
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtmpproto.c
View File

@ -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;
}