RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756' 

* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
	libavformat/utils.c

See: 44a7a6300d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-04 13:09:54 +02:00
parent e7389ed5d0 dbb1425811
commit ab2989378f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/avfiltergraph.c
View File

@ -84,6 +84,10 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
graph->filters = filters;
graph->filters[graph->nb_filters++] = filter;
#if FF_API_FOO_COUNT
graph->filter_count_unused = graph->nb_filters;
#endif
return 0;
}

2
libavformat/utils.c
View File

@ -3274,6 +3274,7 @@ void ff_free_stream(AVFormatContext *s, AVStream *st){
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);
@ -3282,7 +3283,6 @@ void ff_free_stream(AVFormatContext *s, AVStream *st){
if (st->info)
av_freep(&st->info->duration_error);
av_freep(&st->info);
av_freep(&st->probe_data.buf);
av_freep(&s->streams[ --s->nb_streams ]);
}