diff options
author | Michael Niedermayer <[email protected]> | 2013-09-22 17:43:33 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2013-09-22 17:43:33 +0200 |
commit | 9b0736c08ac59ae5da598ef32e9165ddf5c3f645 (patch) | |
tree | 5754125f2b943c08708b94e111b55e8af597ab0c /libavformat/utils.c | |
parent | 70a1182a484402fc893d7fe4530d7bb9d636524a (diff) | |
parent | 3197a9c4fa46972077e12065047c3d52ef4b40f6 (diff) |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
Update changelog for 0.7.8 release
aac: check the maximum number of channels
oggdec: fix faulty cleanup prototype
qdm2: check that the FFT size is a power of 2
rv10: check that extradata is large enough
lavf: make sure stream probe data gets freed.
dfa: check for invalid access in decode_wdlt().
avfiltergraph: check for sws opts being non-NULL before using them.
Conflicts:
Changelog
libavformat/utils.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index ccc7540e96..3b4ea46a99 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2670,6 +2670,7 @@ void avformat_free_context(AVFormatContext *s) av_free_packet(&st->cur_pkt); } 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); |