Module: libav
Branch: master
Commit: 3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b

Author:    Luca Barbato <[email protected]>
Committer: Luca Barbato <[email protected]>
Date:      Sat Sep 15 20:16:32 2012 +0200

avformat: fix typo in avformat_close_input

The condition should not be &&.

---

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

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;
 

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to