diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 15:44:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 15:45:04 +0200 |
| commit | dda7bd13b3498243a199c77aac4fca602147828f (patch) | |
| tree | bb50e6a11206a50a1b3f6f2e09e37b88e6cf3ce1 /libavformat/rtmpproto.c | |
| parent | 8c320b3c0831b181585c8285e0b43d1a62fecc52 (diff) | |
| parent | 5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91 (diff) | |
| download | ffmpeg-dda7bd13b3498243a199c77aac4fca602147828f.tar.gz | |
Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'
* commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91':
rtmp: Unbreak get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index fca29b6ff3..62227eea28 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2183,6 +2183,7 @@ static int get_packet(URLContext *s, int for_header) { RTMPContext *rt = s->priv_data; int ret; + uint8_t *p; const uint8_t *next; uint32_t size; 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; if ((err = av_reallocp(&rt->flv_data, rt->flv_size)) < 0) return err; - bytestream_put_byte(&rt->flv_data, rpkt.type); - bytestream_put_be24(&rt->flv_data, rpkt.size); - bytestream_put_be24(&rt->flv_data, ts); - bytestream_put_byte(&rt->flv_data, ts >> 24); - bytestream_put_be24(&rt->flv_data, 0); - bytestream_put_buffer(&rt->flv_data, rpkt.data, rpkt.size); - bytestream_put_be32(&rt->flv_data, 0); + p = rt->flv_data; + bytestream_put_byte(&p, rpkt.type); + bytestream_put_be24(&p, rpkt.size); + bytestream_put_be24(&p, ts); + bytestream_put_byte(&p, ts >> 24); + bytestream_put_be24(&p, 0); + bytestream_put_buffer(&p, rpkt.data, rpkt.size); + bytestream_put_be32(&p, 0); ff_rtmp_packet_destroy(&rpkt); return 0; } else if (rpkt.type == RTMP_PT_NOTIFY) { @@ -2273,7 +2275,6 @@ static int get_packet(URLContext *s, int for_header) return 0; } else if (rpkt.type == RTMP_PT_METADATA) { int err; - uint8_t *p; // we got raw FLV data, make it available for FLV demuxer rt->flv_off = 0; rt->flv_size = rpkt.size; |