diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index c2da1f66d5..0bc8252465 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -611,8 +611,9 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s,
     }
     if (!(s->state & PNG_IDAT)) {
         /* init image info */
-        avctx->width  = s->width;
-        avctx->height = s->height;
+        ret = ff_set_dimensions(avctx, s->width, s->height);
+        if (ret < 0)
+            return ret;
 
         s->channels       = ff_png_get_nb_channels(s->color_type);
         s->bits_per_pixel = s->bit_depth * s->channels;