Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Apr 2013 11:09:54 +0000 (13:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Apr 2013 11:24:33 +0000 (13:24 +0200)
* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
libavformat/utils.c

See: 44a7a6300d104dd453bcd5c601e9c6944fb34679

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/avfiltergraph.c
libavformat/utils.c

@@@ -84,6 -69,10 +84,10 @@@ int avfilter_graph_add_filter(AVFilterG
      graph->filters = filters;
      graph->filters[graph->nb_filters++] = filter;
  
 -    graph->filter_count = graph->nb_filters;
+ #if FF_API_FOO_COUNT
++    graph->filter_count_unused = graph->nb_filters;
+ #endif
      return 0;
  }
  
@@@ -3264,28 -2632,6 +3264,28 @@@ int av_read_pause(AVFormatContext *s
      return AVERROR(ENOSYS);
  }
  
-     av_freep(&st->probe_data.buf);
 +void ff_free_stream(AVFormatContext *s, AVStream *st){
 +    av_assert0(s->nb_streams>0);
 +    av_assert0(s->streams[ s->nb_streams-1 ] == st);
 +
 +    if (st->parser) {
 +        av_parser_close(st->parser);
 +    }
 +    if (st->attached_pic.data)
 +        av_free_packet(&st->attached_pic);
 +    av_dict_free(&st->metadata);
++    av_freep(&st->probe_data.buf);
 +    av_freep(&st->index_entries);
 +    av_freep(&st->codec->extradata);
 +    av_freep(&st->codec->subtitle_header);
 +    av_freep(&st->codec);
 +    av_freep(&st->priv_data);
 +    if (st->info)
 +        av_freep(&st->info->duration_error);
 +    av_freep(&st->info);
 +    av_freep(&s->streams[ --s->nb_streams ]);
 +}
 +
  void avformat_free_context(AVFormatContext *s)
  {
      int i;