aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-02-07 15:49:09 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-02-07 21:32:08 +0100
commit8c2ea3030af7b40a3c4275696fb5c76cdb80950a (patch)
tree77907c80341e738354fcece1908d837549c0a71e /libavcodec
parentdface53497c3531da101b2872df301acca313142 (diff)
downloadffmpeg-8c2ea3030af7b40a3c4275696fb5c76cdb80950a.tar.gz
avcodec/pictordec: Fix logic error
Fixes: 559/clusterfuzz-testcase-6424225917173760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/pictordec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index ff6eb7f4fc..0cfc785832 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -142,7 +142,7 @@ static int decode_frame(AVCodecContext *avctx,
if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
return -1;
- if (s->width != avctx->width && s->height != avctx->height) {
+ if (s->width != avctx->width || s->height != avctx->height) {
ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;