From 10aa23f751069fe464fbc3c0e35dcf9294f055f7 Mon Sep 17 00:00:00 2001 From: hkuang Date: Wed, 2 Jul 2014 17:20:45 -0700 Subject: [PATCH] ctrl_get_reference does not need user_priv. The relationship of the user private data at runtime is not preserved from decode() to this call which may occur at an unknown point in the future Change-Id: Ia7eb25365c805147614574c3af87aedbe0305fc6 --- test/user_priv_test.cc | 2 +- vp9/vp9_dx_iface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/user_priv_test.cc b/test/user_priv_test.cc index f9aef33da..22fce857c 100644 --- a/test/user_priv_test.cc +++ b/test/user_priv_test.cc @@ -78,7 +78,7 @@ string DecodeFile(const string &filename) { ref.idx = rnd.Rand8() % 3; decoder.Control(VP9_GET_REFERENCE, &ref); - CheckUserPrivateData(ref.img.user_priv, &frame_num); + CheckUserPrivateData(ref.img.user_priv, NULL); } md5.Add(img); } diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 3a73eeaa1..746fab006 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -671,7 +671,7 @@ static vpx_codec_err_t ctrl_get_reference(vpx_codec_alg_priv_t *ctx, VP9Worker *const worker = ctx->frame_workers; FrameWorkerData *const worker_data = (FrameWorkerData *)worker->data1; vp9_get_reference_dec(worker_data->pbi, data->idx, &fb); - yuvconfig2image(&data->img, fb, worker_data->user_priv); + yuvconfig2image(&data->img, fb, NULL); return VPX_CODEC_OK; } else { return VPX_CODEC_INVALID_PARAM;