[FFmpeg-cvslog] lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails

David Goldwich git at videolan.org
Sat Oct 1 22:47:33 CEST 2011


ffmpeg | branch: release/0.8 | David Goldwich <david.goldwich at gmail.com> | Sat Sep 17 13:50:35 2011 +0200| [9973ca992e8499848b8d5b0b536e709109dc65e2] | committer: Reinhard Tartler

lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails

Signed-off-by: David Goldwich <david.goldwich at gmail.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 63d64228a7f31d534e3bcae87cbd37f4a0ae2dd6)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9973ca992e8499848b8d5b0b536e709109dc65e2
---

 libavformat/utils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2cb096e..d9d154e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -469,8 +469,8 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
         goto fail;
     ic->pb = ic->pb ? ic->pb : pb; // don't leak custom pb if it wasn't set above
 
-    *ic_ptr = ic;
 fail:
+    *ic_ptr = ic;
     av_dict_free(&opts);
     return err;
 }



More information about the ffmpeg-cvslog mailing list