summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorKai Wasserbäch <[email protected]>2016-08-20 18:14:53 +0200
committerChristian König <[email protected]>2016-08-24 10:35:20 +0200
commit83d08d4cab1cd6577dd304e6f8acead4076ccf5d (patch)
tree9e077af4d2c11cb4c3617aaa313159db5c9e9fc8 /src/gallium
parentcd340052adf4246284311f5262664ab8867396e2 (diff)
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 <[email protected]> Signed-off-by: Kai Wasserbäch <[email protected]> Reviewed-by: Christian König <[email protected]> Reviewed-by: Boyuan Zhang <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/state_trackers/va/picture.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c
index 87567be10e7..bbb559561f7 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;
}