[FFmpeg-cvslog] avformat/utils: free s-> pb for image2 as it can be used with and without a file

Michael Niedermayer git at videolan.org
Sat Sep 13 23:32:50 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 13 22:56:05 2014 +0200| [36ea35bbc0e3364d7725a0eed8ebde258a3e75fd] | committer: Michael Niedermayer

avformat/utils: free s->pb for image2 as it can be used with and without a file

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d6e3e50..e899e4d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3548,7 +3548,7 @@ void avformat_close_input(AVFormatContext **ps)
     s  = *ps;
     pb = s->pb;
 
-    if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) ||
+    if ((s->iformat && strcmp(s->iformat->name, "image2") && s->iformat->flags & AVFMT_NOFILE) ||
         (s->flags & AVFMT_FLAG_CUSTOM_IO))
         pb = NULL;
 



More information about the ffmpeg-cvslog mailing list