diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:09:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:24:33 +0200 |
| commit | ab2989378fc59128b7e372fadceeb376c9e8cae0 (patch) | |
| tree | 5781feee90fe410edfa45f4441ddf152dc356e5e /libavformat | |
| parent | e7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1 (diff) | |
| parent | dbb1425811a672eddf4acf0513237cdf20f83756 (diff) | |
| download | ffmpeg-ab2989378fc59128b7e372fadceeb376c9e8cae0.tar.gz | |
Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
* 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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index c5d6d322c3..e32f97288d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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 ]); } |