summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@gmail.com>2010-04-06 09:11:27 +0800
committerAustin Yuan <shengquan.yuan@gmail.com>2010-04-06 09:11:27 +0800
commit0fde14cc75e272bb12579ee7a4b155bf68765b1f (patch)
tree4aeb8be96f5143d9da9747b8b705e9e8fab13190
parent0793e85327337cd8508e6b06f4c127689d03622c (diff)
parentd304b16931b546fb5ca2bcaf583c823f036f140e (diff)
downloadlibva-0fde14cc75e272bb12579ee7a4b155bf68765b1f.tar.gz
Merge branch 'master' of ssh://git@moblin.intel.com/umg-moorestown-libva
-rw-r--r--va/android/va_android.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/va/android/va_android.c b/va/android/va_android.c
index ec15d6a..687b86d 100644
--- a/va/android/va_android.c
+++ b/va/android/va_android.c
@@ -23,9 +23,9 @@
*/
#define _GNU_SOURCE 1
-#include "../va.h"
-#include "../va_backend.h"
-#include "../va_android.h"
+#include "va.h"
+#include "va_backend.h"
+#include "va_android.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -42,7 +42,15 @@ static int va_DisplayContextIsValid (
VADisplayContextP pDisplayContext
)
{
- return 1;
+ VADisplayContextP ctx = pDisplayContexts;
+
+ while (ctx)
+ {
+ if (ctx == pDisplayContext && pDisplayContext->pDriverContext)
+ return 1;
+ ctx = ctx->pNext;
+ }
+ return 0;
}
static void va_DisplayContextDestroy (
@@ -78,7 +86,7 @@ static VAStatus va_DisplayContextGetDriverName (
unsigned int device_id;
char driver_name[64];
} devices[] = {
- { 0x8086, 0x4100, "android" },
+ { 0x8086, 0x4100, "pvr" },
};
if (driver_name)