virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

rtmp: Unbreak handle_notify

Browse Source 
Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
This commit is contained in:
Luca Barbato 2013-09-19 01:49:41 +02:00 committed by Michael Niedermayer
parent 20dfab33f5
commit fbd54827b1
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/rtmpproto.c
View File

@ -2067,7 +2067,7 @@ static int handle_notify(URLContext *s, RTMPPacket *pkt) {
GetByteContext gbc; GetByteContext gbc;
PutByteContext pbc; PutByteContext pbc;
uint32_t ts; uint32_t ts;
int old_flv_size; int old_flv_size, err;
const uint8_t *datatowrite; const uint8_t *datatowrite;
unsigned datatowritelength; unsigned datatowritelength;
@ -2095,22 +2095,23 @@ static int handle_notify(URLContext *s, RTMPPacket *pkt) {
old_flv_size = rt->flv_size; old_flv_size = rt->flv_size;
rt->flv_size += datatowritelength + 15; rt->flv_size += datatowritelength + 15;
} else { } else {
int err;
old_flv_size = 0; old_flv_size = 0;
rt->flv_size = datatowritelength + 15; rt->flv_size = datatowritelength + 15;
rt->flv_off = 0; rt->flv_off = 0;
if ((err = av_reallocp(&rt->flv_data, rt->flv_size)) < 0)
return err;
bytestream2_init_writer(&pbc, rt->flv_data, rt->flv_size);
bytestream2_skip_p(&pbc, old_flv_size);
bytestream2_put_byte(&pbc, pkt->type);
bytestream2_put_be24(&pbc, datatowritelength);
bytestream2_put_be24(&pbc, ts);
bytestream2_put_byte(&pbc, ts >> 24);
bytestream2_put_be24(&pbc, 0);
bytestream2_put_buffer(&pbc, datatowrite, datatowritelength);
bytestream2_put_be32(&pbc, 0);
} }
if ((err = av_reallocp(&rt->flv_data, rt->flv_size)) < 0)
return err;
bytestream2_init_writer(&pbc, rt->flv_data, rt->flv_size);
bytestream2_skip_p(&pbc, old_flv_size);
bytestream2_put_byte(&pbc, pkt->type);
bytestream2_put_be24(&pbc, datatowritelength);
bytestream2_put_be24(&pbc, ts);
bytestream2_put_byte(&pbc, ts >> 24);
bytestream2_put_be24(&pbc, 0);
bytestream2_put_buffer(&pbc, datatowrite, datatowritelength);
bytestream2_put_be32(&pbc, 0);
return 0; return 0;
} }