Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:55:14 +0000 (22:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:55:20 +0000 (22:55 +0100)
* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8':
  rtpdec: Get rid of all trivial .alloc/.free functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
18 files changed:
1  2 
libavformat/rtpdec_ac3.c
libavformat/rtpdec_amr.c
libavformat/rtpdec_asf.c
libavformat/rtpdec_dv.c
libavformat/rtpdec_h261.c
libavformat/rtpdec_h263_rfc2190.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_hevc.c
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_qcelp.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_qt.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_xiph.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -91,16 -91,11 +91,11 @@@ static const AttrNameMap attr_names[] 
      { NULL, -1, -1 },
  };
  
- static PayloadContext *new_context(void)
- {
-     return av_mallocz(sizeof(PayloadContext));
- }
  static void free_context(PayloadContext *data)
  {
 -    av_free(data->au_headers);
 -    av_free(data->mode);
 -    av_free(data);
 +    av_freep(&data->au_headers);
 +    av_freep(&data->mode);
 +    av_freep(&data);
  }
  
  static int parse_fmtp_config(AVCodecContext *codec, char *value)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge