Merge commit 'db158f0dd217cf839be8af195d66cf49a76537a8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:26:15 +0000 (22:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:26:15 +0000 (22:26 +0100)
* commit 'db158f0dd217cf839be8af195d66cf49a76537a8':
  rtpdec: Remove unnecessary _if_needed suffixes on functions

Conflicts:
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_xiph.c

Simple merge
@@@ -66,9 -66,9 +66,9 @@@ static inline void free_fragment(Payloa
  
  static void xiph_free_context(PayloadContext * data)
  {
-     free_fragment_if_needed(data);
+     free_fragment(data);
 -    av_free(data->split_buf);
 -    av_free(data);
 +    av_freep(&data->split_buf);
 +    av_freep(&data);
  }
  
  static av_cold int xiph_vorbis_init(AVFormatContext *ctx, int st_index,