har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'

Browse Source 
* commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91':
  rtmp: Unbreak get_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-20 15:44:57 +02:00
commit dda7bd13b3
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/rtmpproto.c
View File

@ -2183,6 +2183,7 @@ static int get_packet(URLContext *s, int for_header)
{ {
RTMPContext *rt = s->priv_data; RTMPContext *rt = s->priv_data;
int ret; int ret;
uint8_t *p;
const uint8_t *next; const uint8_t *next;
uint32_t size; uint32_t size;
uint32_t ts, cts, pts=0; uint32_t ts, cts, pts=0;
@ -2254,13 +2255,14 @@ static int get_packet(URLContext *s, int for_header)
rt->flv_size = rpkt.size + 15; rt->flv_size = rpkt.size + 15;
if ((err = av_reallocp(&rt->flv_data, rt->flv_size)) < 0) if ((err = av_reallocp(&rt->flv_data, rt->flv_size)) < 0)
return err; return err;
bytestream_put_byte(&rt->flv_data, rpkt.type); p = rt->flv_data;
bytestream_put_be24(&rt->flv_data, rpkt.size); bytestream_put_byte(&p, rpkt.type);
bytestream_put_be24(&rt->flv_data, ts); bytestream_put_be24(&p, rpkt.size);
bytestream_put_byte(&rt->flv_data, ts >> 24); bytestream_put_be24(&p, ts);
bytestream_put_be24(&rt->flv_data, 0); bytestream_put_byte(&p, ts >> 24);
bytestream_put_buffer(&rt->flv_data, rpkt.data, rpkt.size); bytestream_put_be24(&p, 0);
bytestream_put_be32(&rt->flv_data, 0); bytestream_put_buffer(&p, rpkt.data, rpkt.size);
bytestream_put_be32(&p, 0);
ff_rtmp_packet_destroy(&rpkt); ff_rtmp_packet_destroy(&rpkt);
return 0; return 0;
} else if (rpkt.type == RTMP_PT_NOTIFY) { } else if (rpkt.type == RTMP_PT_NOTIFY) {
@ -2273,7 +2275,6 @@ static int get_packet(URLContext *s, int for_header)
return 0; return 0;
} else if (rpkt.type == RTMP_PT_METADATA) { } else if (rpkt.type == RTMP_PT_METADATA) {
int err; int err;
uint8_t *p;
// we got raw FLV data, make it available for FLV demuxer // we got raw FLV data, make it available for FLV demuxer
rt->flv_off = 0; rt->flv_off = 0;
rt->flv_size = rpkt.size; rt->flv_size = rpkt.size;