diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:48:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:48:50 +0100 |
| commit | 7f03f75ce72fe1c6adfc63f621eeb69cde13769a (patch) | |
| tree | 7b20dea793e95c3fe5ab4bccbedd2e83e504f4d3 /libavformat/rtsp.c | |
| parent | 7d9b06eb179fb0d032c530d21182dce3fe0a7671 (diff) | |
| parent | 8e32b1f0963d01d4f5d4803eb721f162e0d58d9a (diff) | |
Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'
* commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a':
libavformat: Use ffio_free_dyn_buf where applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 890b77d866..529e34b297 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -710,11 +710,9 @@ void ff_rtsp_undo_setup(AVFormatContext *s, int send_packets) AVFormatContext *rtpctx = rtsp_st->transport_priv; av_write_trailer(rtpctx); if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) { - uint8_t *ptr; if (CONFIG_RTSP_MUXER && rtpctx->pb && send_packets) ff_rtsp_tcp_write_packet(s, rtsp_st); - avio_close_dyn_buf(rtpctx->pb, &ptr); - av_free(ptr); + ffio_free_dyn_buf(&rtpctx->pb); } else { avio_closep(&rtpctx->pb); } |