From 83d08d4cab1cd6577dd304e6f8acead4076ccf5d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kai=20Wasserb=C3=A4ch?= Date: Sat, 20 Aug 2016 18:14:53 +0200 Subject: [PATCH] st/va: Remove else case in vlVaEndPicture() made superfluous by c59628d11b MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit c59628d11b134fc016388a170880f7646e100d6f made the else statement and duplication of the context->decoder->end_frame() call superfluous. Cc: Boyuan Zhang Signed-off-by: Kai Wasserbäch Reviewed-by: Christian König Reviewed-by: Boyuan Zhang --- src/gallium/state_trackers/va/picture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c index 87567be..bbb5595 100644 --- a/src/gallium/state_trackers/va/picture.c +++ b/src/gallium/state_trackers/va/picture.c @@ -576,11 +576,9 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) surf->frame_num_cnt = context->desc.h264enc.frame_num_cnt; surf->feedback = feedback; surf->coded_buf = coded_buf; - context->decoder->end_frame(context->decoder, context->target, &context->desc.base); } - else - context->decoder->end_frame(context->decoder, context->target, &context->desc.base); + context->decoder->end_frame(context->decoder, context->target, &context->desc.base); pipe_mutex_unlock(drv->mutex); return VA_STATUS_SUCCESS; } -- 2.7.4