summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-02-09 07:41:40 -0800
committerCode Review <code-review@webmproject.org>2011-02-09 07:41:40 -0800
commitc96031da690f5bb17c447c2ed92d0ab2f07150d2 (patch)
tree8fbccadb0494fa9ef5170206e8779d84a3bed6ad
parente5aaac24bb9f06ccd44505b0af6116b9ca3bd73f (diff)
parentddacf1cf699894f40eac1bc6c3933d5231391e91 (diff)
downloadlibvpx-c96031da690f5bb17c447c2ed92d0ab2f07150d2.tar
libvpx-c96031da690f5bb17c447c2ed92d0ab2f07150d2.tar.gz
libvpx-c96031da690f5bb17c447c2ed92d0ab2f07150d2.tar.bz2
libvpx-c96031da690f5bb17c447c2ed92d0ab2f07150d2.zip
Merge "vp8e_get_preview fixed for resized frames"
-rw-r--r--vp8/vp8_cx_iface.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index b23bd951d..ea99c6102 100644
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -912,8 +912,8 @@ static vpx_image_t *vp8e_get_preview(vpx_codec_alg_priv_t *ctx)
ctx->preview_img.x_chroma_shift = 1;
ctx->preview_img.y_chroma_shift = 1;
- ctx->preview_img.d_w = ctx->cfg.g_w;
- ctx->preview_img.d_h = ctx->cfg.g_h;
+ ctx->preview_img.d_w = sd.y_width;
+ ctx->preview_img.d_h = sd.y_height;
ctx->preview_img.stride[VPX_PLANE_Y] = sd.y_stride;
ctx->preview_img.stride[VPX_PLANE_U] = sd.uv_stride;
ctx->preview_img.stride[VPX_PLANE_V] = sd.uv_stride;