Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:58:35 +0000 (00:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:58:39 +0000 (00:58 +0100)
* commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd':
  rtpdec: Rename the free method to close

Merged-by: Michael Niedermayer <michaelni@gmx.at>
18 files changed:
1  2 
libavformat/rdt.c
libavformat/rtpdec.h
libavformat/rtpdec_ac3.c
libavformat/rtpdec_asf.c
libavformat/rtpdec_dv.c
libavformat/rtpdec_h261.c
libavformat/rtpdec_h263_rfc2190.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_qt.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_vp8.c
libavformat/rtpdec_xiph.c
libavformat/rtsp.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -32,10 -32,10 +32,10 @@@ struct PayloadContext 
      uint32_t timestamp;
  };
  
- static void latm_free_context(PayloadContext *data)
+ static void latm_close_context(PayloadContext *data)
  {
      ffio_free_dyn_buf(&data->dyn_buf);
 -    av_free(data->buf);
 +    av_freep(&data->buf);
  }
  
  static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data,
Simple merge
@@@ -91,10 -91,10 +91,10 @@@ static const AttrNameMap attr_names[] 
      { NULL, -1, -1 },
  };
  
- static void free_context(PayloadContext *data)
+ static void close_context(PayloadContext *data)
  {
 -    av_free(data->au_headers);
 -    av_free(data->mode);
 +    av_freep(&data->au_headers);
 +    av_freep(&data->mode);
  }
  
  static int parse_fmtp_config(AVCodecContext *codec, const char *value)
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -50,10 -50,10 +50,10 @@@ struct PayloadContext 
      int split_pkts;
  };
  
- static void xiph_free_context(PayloadContext * data)
+ static void xiph_close_context(PayloadContext * data)
  {
      ffio_free_dyn_buf(&data->fragment);
 -    av_free(data->split_buf);
 +    av_freep(&data->split_buf);
  }
  
  
Simple merge