diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-18 11:00:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-18 11:00:51 +0200 |
| commit | e81411e88e1c6614099c7478b4382523601d0740 (patch) | |
| tree | 350babee477e751af44b4cb1a74d51b4eda130fb /libavformat | |
| parent | 7742edc03b3cd2cc72b293ae22d1f6cdfe0943f0 (diff) | |
| parent | 647d655d19c38e9716328e4787199149097d6089 (diff) | |
| download | ffmpeg-e81411e88e1c6614099c7478b4382523601d0740.tar.gz | |
Merge commit '647d655d19c38e9716328e4787199149097d6089'
* commit '647d655d19c38e9716328e4787199149097d6089':
rtmpproto: Consistently use the right prev_pkt array
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtmpproto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index aac3c3370e..eaed3ea50f 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -403,7 +403,7 @@ static int read_connect(URLContext *s, RTMPContext *rt) GetByteContext gbc; if ((ret = ff_rtmp_packet_read(rt->stream, &pkt, rt->in_chunk_size, - rt->prev_pkt[1])) < 0) + rt->prev_pkt[0])) < 0) return ret; cp = pkt.data; bytestream2_init(&gbc, cp, pkt.size); |