aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-09-15 20:16:32 +0200
committerLuca Barbato <lu_zero@gentoo.org>2012-09-15 20:23:39 +0200
commit3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b (patch)
tree51501bb157808eb2c45ec40808ccfb2b2596a4bc
parent7040c9fac246ad9f8333d635045d24bc107ecfa8 (diff)
downloadffmpeg-3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b.tar.gz
avformat: fix typo in avformat_close_input
The condition should not be &&.
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index b5b49c93c4..e4e4a8b445 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;