Merge commit '16381923fb7b9087ce559fb1cd3594469ac6788b'

[ffmpeg] / libavcodec / rv34.c

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index f84fb005df68966f36f9b33dc0de0ec3554e99d2..4896b39a8c0bfd540ccb99a815007a473422bb38 100644 (file)
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1693,7 +1693,11 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
                 si.width, si.height);
             s->width  = si.width;
             s->height = si.height;
-            avcodec_set_dimensions(s->avctx, s->width, s->height);
+
+            err = ff_set_dimensions(s->avctx, s->width, s->height);
+            if (err < 0)
+                return err;
+
             if ((err = ff_MPV_common_frame_size_change(s)) < 0)
                 return err;
             if ((err = rv34_decoder_realloc(r)) < 0)