Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:34:04 +0000 (22:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:34:08 +0000 (22:34 +0100)
* commit '2b982e92f42a6e661d90b12b6592cd13cae496d4':
  rtpdec: Set need_parsing via a handler field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec_ac3.c
libavformat/rtpdec_dv.c
libavformat/rtpdec_h261.c
libavformat/rtpdec_h263.c
libavformat/rtpdec_h263_rfc2190.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_hevc.c
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_mpeg12.c
libavformat/rtpdec_mpeg4.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
@@@ -67,19 -67,10 +67,10 @@@ static inline void free_fragment(Payloa
  static void xiph_free_context(PayloadContext * 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,
-                                     PayloadContext *data)
- {
-     if (st_index < 0)
-         return 0;
-     ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_HEADERS;
-     return 0;
- }
  
  static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data,
                                AVStream *st, AVPacket *pkt, uint32_t *timestamp,