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

Christian König deathsimple at kemper.freedesktop.org
Wed Aug 24 08:36:10 UTC 2016


Module: Mesa
Branch: master
Commit: 83d08d4cab1cd6577dd304e6f8acead4076ccf5d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83d08d4cab1cd6577dd304e6f8acead4076ccf5d

Author: Kai Wasserbäch <kai at dev.carbon-project.org>
Date:   Sat Aug 20 18:14:53 2016 +0200

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 at amd.com>
Signed-off-by: Kai Wasserbäch <kai at dev.carbon-project.org>
Reviewed-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Boyuan Zhang <boyuan.zhang at amd.com>

---

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




More information about the mesa-commit mailing list