From fd964e45d683c82ab7cd4ebb9fa60a6e82976ccf Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Mon, 17 Oct 2011 15:13:39 +0200 Subject: i965_drv_video: fix return values to vaRenderPicture(). Undefined status was returned from vaRenderPicture() with no VA buffer. Likewise, any failure to process a VA buffer could still lead to success. Signed-off-by: Gwenole Beauchesne --- src/i965_drv_video.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c index 89c01be..4ba1aa6 100644 --- a/src/i965_drv_video.c +++ b/src/i965_drv_video.c @@ -1286,10 +1286,10 @@ i965_decoder_render_picture(VADriverContextP ctx, { struct i965_driver_data *i965 = i965_driver_data(ctx); struct object_context *obj_context = CONTEXT(context); - VAStatus vaStatus; + VAStatus vaStatus = VA_STATUS_SUCCESS; int i; - for (i = 0; i < num_buffers; i++) { + for (i = 0; i < num_buffers && vaStatus == VA_STATUS_SUCCESS; i++) { struct object_buffer *obj_buffer = BUFFER(buffers[i]); assert(obj_buffer); @@ -1422,10 +1422,10 @@ i965_encoder_render_picture(VADriverContextP ctx, { struct i965_driver_data *i965 = i965_driver_data(ctx); struct object_context *obj_context = CONTEXT(context); - VAStatus vaStatus; + VAStatus vaStatus = VA_STATUS_SUCCESS; int i; - for (i = 0; i < num_buffers; i++) { + for (i = 0; i < num_buffers && vaStatus == VA_STATUS_SUCCESS; i++) { struct object_buffer *obj_buffer = BUFFER(buffers[i]); assert(obj_buffer); -- cgit v1.2.3