diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-18 14:08:37 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-18 14:09:06 +0400 |
| commit | 4131a3cb58d93435acdbeda82957e42fcab41e07 (patch) | |
| tree | 2886a8dc36e324285b10196a417e6270cd1271aa /libavformat/rtmpproto.c | |
| parent | 46cc498b77bcb058823687fc98fa6beb290324c0 (diff) | |
| parent | 8583b14252deac71136f1dec231910abab0ba503 (diff) | |
Merge commit '8583b14252deac71136f1dec231910abab0ba503'
* commit '8583b14252deac71136f1dec231910abab0ba503':
rtmp: Support reading interleaved chunks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index edc433fd2a..e8aecfef67 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2306,7 +2306,7 @@ static int get_packet(URLContext *s, int for_header) static int rtmp_close(URLContext *h) { RTMPContext *rt = h->priv_data; - int ret = 0; + int ret = 0, i, j; if (!rt->is_input) { rt->flv_data = NULL; @@ -2317,6 +2317,9 @@ static int rtmp_close(URLContext *h) } if (rt->state > STATE_HANDSHAKED) ret = gen_delete_stream(h, rt); + for (i = 0; i < 2; i++) + for (j = 0; j < RTMP_CHANNELS; j++) + ff_rtmp_packet_destroy(&rt->prev_pkt[i][j]); free_tracked_methods(rt); av_freep(&rt->flv_data); |