From: Kai Wasserbäch <kai@dev.carbon-project.org>
Date: Sat, 20 Aug 2016 16:14:53 +0000 (+0200)
Subject: st/va: Remove else case in vlVaEndPicture() made superfluous by c59628d11b
X-Git-Tag: upstream/17.1.0~7093
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83d08d4cab1cd6577dd304e6f8acead4076ccf5d;p=platform%2Fupstream%2Fmesa.git

st/va: Remove else case in vlVaEndPicture() made superfluous by c59628d11b

Commit c59628d11b134fc016388a170880f7646e100d6f made the else statement
and duplication of the context->decoder->end_frame() call superfluous.

Cc: Boyuan Zhang <boyuan.zhang@amd.com>
Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Boyuan Zhang <boyuan.zhang@amd.com>
---

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;
 }