From ebb82604b0b14c79917466107c39592a20e5b0c5 Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Wed, 15 Jul 2009 10:00:16 +0000 Subject: [PATCH] Only free '*ic_ptr' when a caller has pre-allocated a context and passed it in (wherein av_open_input_file assumes memory ownership). Patch by Art Clarke a xuggle com Originally committed as revision 19436 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3fce3fa87b..0c1a50d816 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -499,7 +499,9 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, av_freep(&pd->buf); if (pb) url_fclose(pb); - av_freep(ic_ptr); + if (ap && ap->prealloced_context) + av_free(*ic_ptr); + *ic_ptr = NULL; return err; }