aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-10-24 09:24:41 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2015-10-24 15:11:59 -0400
commit49d8a70dc51ea5f05d747b4acc4e772252e86cbc (patch)
treead55a9baa98f5943832050d2a4a36ae20b1003e8
parent52f84d82bdf1851ecfcc412c1719e5f6f3396209 (diff)
downloadffmpeg-49d8a70dc51ea5f05d747b4acc4e772252e86cbc.tar.gz
vp9: uses ff_set_dimensions (which sets coded_width/height).
Fixes ticket 4935.
-rw-r--r--libavcodec/vp9.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 3753e89202..d4061e2457 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -215,15 +215,15 @@ static int update_size(AVCodecContext *ctx, int w, int h, enum AVPixelFormat fmt
{
VP9Context *s = ctx->priv_data;
uint8_t *p;
- int bytesperpixel = s->bytesperpixel;
+ int bytesperpixel = s->bytesperpixel, res;
av_assert0(w > 0 && h > 0);
if (s->intra_pred_data[0] && w == ctx->width && h == ctx->height && ctx->pix_fmt == fmt)
return 0;
- ctx->width = w;
- ctx->height = h;
+ if ((res = ff_set_dimensions(ctx, w, h)) < 0)
+ return res;
ctx->pix_fmt = fmt;
s->sb_cols = (w + 63) >> 6;
s->sb_rows = (h + 63) >> 6;