Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:25:12 +0000 (00:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:25:12 +0000 (00:25 +0100)
* commit 'bb4a310bb85f43e62240145a656b1e5285b14239':
  rtpdec: Don't free the payload context in the .free function

Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
1  2 
libavformat/rdt.c
libavformat/rtpdec.h
libavformat/rtpdec_ac3.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
@@@ -38,8 -38,7 +38,7 @@@ static void latm_free_context(PayloadCo
          avio_close_dyn_buf(data->dyn_buf, &p);
          av_free(p);
      }
 -    av_free(data->buf);
 +    av_freep(&data->buf);
-     av_free(data);
  }
  
  static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data,
Simple merge
@@@ -93,9 -93,8 +93,8 @@@ static const AttrNameMap attr_names[] 
  
  static void free_context(PayloadContext *data)
  {
 -    av_free(data->au_headers);
 -    av_free(data->mode);
 +    av_freep(&data->au_headers);
 +    av_freep(&data->mode);
-     av_freep(&data);
  }
  
  static int parse_fmtp_config(AVCodecContext *codec, const char *value)
@@@ -35,8 -35,7 +35,7 @@@ static void mpegts_free_context(Payload
      if (!data)
          return;
      if (data->ts)
 -        ff_mpegts_parse_close(data->ts);
 +        avpriv_mpegts_parse_close(data->ts);
-     av_free(data);
  }
  
  static av_cold int mpegts_init(AVFormatContext *ctx, int st_index,
Simple merge
Simple merge
Simple merge
@@@ -62,8 -62,7 +62,7 @@@ static void free_fragment(PayloadContex
  static void xiph_free_context(PayloadContext * data)
  {
      free_fragment(data);
 -    av_free(data->split_buf);
 +    av_freep(&data->split_buf);
-     av_freep(&data);
  }
  
  
@@@ -732,20 -725,19 +732,19 @@@ void ff_rtsp_close_streams(AVFormatCont
                  if (rtsp_st->dynamic_handler->free)
                      rtsp_st->dynamic_handler->free(
                          rtsp_st->dynamic_protocol_context);
-                 else
-                     av_free(rtsp_st->dynamic_protocol_context);
+                 av_free(rtsp_st->dynamic_protocol_context);
              }
              for (j = 0; j < rtsp_st->nb_include_source_addrs; j++)
 -                av_free(rtsp_st->include_source_addrs[j]);
 +                av_freep(&rtsp_st->include_source_addrs[j]);
              av_freep(&rtsp_st->include_source_addrs);
              for (j = 0; j < rtsp_st->nb_exclude_source_addrs; j++)
 -                av_free(rtsp_st->exclude_source_addrs[j]);
 +                av_freep(&rtsp_st->exclude_source_addrs[j]);
              av_freep(&rtsp_st->exclude_source_addrs);
  
 -            av_free(rtsp_st);
 +            av_freep(&rtsp_st);
          }
      }
 -    av_free(rt->rtsp_streams);
 +    av_freep(&rt->rtsp_streams);
      if (rt->asf_ctx) {
          avformat_close_input(&rt->asf_ctx);
      }