diff --git a/avconv_qsv.c b/avconv_qsv.c
index 8272f17194..400cf22c87 100644
--- a/avconv_qsv.c
+++ b/avconv_qsv.c
@@ -76,8 +76,8 @@ int qsv_init(AVCodecContext *s)
     frames_ctx   = (AVHWFramesContext*)ist->hw_frames_ctx->data;
     frames_hwctx = frames_ctx->hwctx;
 
-    frames_ctx->width             = s->coded_width;
-    frames_ctx->height            = s->coded_height;
+    frames_ctx->width             = FFALIGN(s->coded_width,  32);
+    frames_ctx->height            = FFALIGN(s->coded_height, 32);
     frames_ctx->format            = AV_PIX_FMT_QSV;
     frames_ctx->sw_format         = AV_PIX_FMT_NV12;
     frames_ctx->initial_pool_size = 32;