summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/state_trackers/va/image.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/va/image.c b/src/gallium/state_trackers/va/image.c
index 807fc832c7f..f7e0db08961 100644
--- a/src/gallium/state_trackers/va/image.c
+++ b/src/gallium/state_trackers/va/image.c
@@ -212,9 +212,12 @@ vlVaDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image)
surf = handle_table_get(drv->htab, surface);
- if (!surf || !surf->buffer || surf->buffer->interlaced)
+ if (!surf || !surf->buffer)
return VA_STATUS_ERROR_INVALID_SURFACE;
+ if (surf->buffer->interlaced)
+ return VA_STATUS_ERROR_OPERATION_FAILED;
+
surfaces = surf->buffer->get_surfaces(surf->buffer);
if (!surfaces || !surfaces[0]->texture)
return VA_STATUS_ERROR_ALLOCATION_FAILED;
@@ -261,7 +264,7 @@ vlVaDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image)
default:
/* VaDeriveImage is designed for contiguous planes. */
FREE(img);
- return VA_STATUS_ERROR_INVALID_IMAGE_FORMAT;
+ return VA_STATUS_ERROR_OPERATION_FAILED;
}
img_buf = CALLOC(1, sizeof(vlVaBuffer));