[FFmpeg-cvslog] avformat: fix typo in avformat_close_input

Luca Barbato git at videolan.org
Sun Sep 16 14:29:20 CEST 2012


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Sep 15 20:16:32 2012 +0200| [3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b] | committer: Luca Barbato

avformat: fix typo in avformat_close_input

The condition should not be &&.

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

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index b5b49c9..e4e4a8b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2704,7 +2704,7 @@ void avformat_close_input(AVFormatContext **ps)
     AVFormatContext *s = *ps;
     AVIOContext *pb = s->pb;
 
-    if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) &&
+    if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) ||
         (s->flags & AVFMT_FLAG_CUSTOM_IO))
         pb = NULL;
 



More information about the ffmpeg-cvslog mailing list