Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:48:46 +0000 (00:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:48:50 +0000 (00:48 +0100)
* commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a':
  libavformat: Use ffio_free_dyn_buf where applicable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/dashenc.c
libavformat/id3v2.c
libavformat/movenchint.c
libavformat/mpegtsenc.c
libavformat/nutenc.c
libavformat/rtpenc_chain.c
libavformat/rtpenc_mpegts.c
libavformat/rtsp.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -89,11 -87,9 +89,9 @@@ int ff_rtp_chain_mux_open(AVFormatConte
  
      if (ret) {
          if (handle && rtpctx->pb) {
 -            avio_close(rtpctx->pb);
 +            avio_closep(&rtpctx->pb);
          } else if (rtpctx->pb) {
-             uint8_t *ptr;
-             avio_close_dyn_buf(rtpctx->pb, &ptr);
-             av_free(ptr);
+             ffio_free_dyn_buf(&rtpctx->pb);
          }
          avformat_free_context(rtpctx);
          return ret;
Simple merge
@@@ -710,13 -703,11 +710,11 @@@ void ff_rtsp_undo_setup(AVFormatContex
                  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_close(rtpctx->pb);
 +                    avio_closep(&rtpctx->pb);
                  }
                  avformat_free_context(rtpctx);
              } else if (CONFIG_RTPDEC && rt->transport == RTSP_TRANSPORT_RDT)