summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2009-08-05 11:48:18 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2009-08-05 11:49:33 +0800
commit2f21a30e2734ce0209b394c764fbd2f9d4b76130 (patch)
tree81988c7f143fdbb0f5e08f5718503e8642cdc60f
parent6310eeee89f70da232b379eb9b3f7cc0ee797581 (diff)
downloadlibva-2f21a30e2734ce0209b394c764fbd2f9d4b76130.tar.gz
i965_drv_driver: fix assertion failure
-rw-r--r--i965_drv_video/i965_drv_video.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 7e7f05a..538a628 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -70,6 +70,8 @@ i965_QueryConfigEntrypoints(VADriverContextP ctx,
VAEntrypoint *entrypoint_list, /* out */
int *num_entrypoints) /* out */
{
+ VAStatus vaStatus = VA_STATUS_SUCCESS;
+
switch (profile) {
case VAProfileMPEG2Simple:
case VAProfileMPEG2Main:
@@ -78,7 +80,7 @@ i965_QueryConfigEntrypoints(VADriverContextP ctx,
break;
default:
- assert(0);
+ vaStatus = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
*num_entrypoints = 0;
break;
}
@@ -86,7 +88,7 @@ i965_QueryConfigEntrypoints(VADriverContextP ctx,
/* If the assert fails then I965_MAX_ENTRYPOINTS needs to be bigger */
assert(*num_entrypoints <= I965_MAX_ENTRYPOINTS);
- return VA_STATUS_SUCCESS;
+ return vaStatus;
}
VAStatus
@@ -173,7 +175,6 @@ i965_CreateConfig(VADriverContextP ctx,
break;
default:
- assert(0);
vaStatus = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
break;
}