From b77e26b28525f366c5f978214b230a5324bedf81 Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Thu, 20 Jul 2017 11:39:11 -0700 Subject: [PATCH] avcodec/hevcdec: hevc_await_progress: declare |y| only if used. hevc_await_progress() uses the variable |y| only inside the "if" block. So |y| only needs to be declared and initialized in that block. Signed-off-by: Wan-Teh Chang Signed-off-by: Michael Niedermayer --- libavcodec/hevcdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 55f51211c3..e084d75767 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -1684,10 +1684,11 @@ static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVF static void hevc_await_progress(HEVCContext *s, HEVCFrame *ref, const Mv *mv, int y0, int height) { - int y = FFMAX(0, (mv->y >> 2) + y0 + height + 9); + if (s->threads_type == FF_THREAD_FRAME ) { + int y = FFMAX(0, (mv->y >> 2) + y0 + height + 9); - if (s->threads_type == FF_THREAD_FRAME ) ff_thread_await_progress(&ref->tf, y, 0); + } } static void hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, int nPbW,