From 9f1afd586b2923b3e694d6229508ab83b89d7758 Mon Sep 17 00:00:00 2001 From: Austin Yuan Date: Tue, 11 May 2010 01:14:53 +0800 Subject: global vaDisplayIsValid Signed-off-by: Austin Yuan --- va/android/va_android.cpp | 5 ----- va/va.c | 2 +- va/x11/va_x11.c | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp index c9c017d..4596657 100644 --- a/va/android/va_android.cpp +++ b/va/android/va_android.cpp @@ -282,11 +282,6 @@ VADisplay vaGetDisplay ( #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext) #define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; } -static int vaDisplayIsValid (VADisplay dpy) -{ - VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; - return pDisplayContext && (pDisplayContext->vadpy_magic == VA_DISPLAY_MAGIC) && pDisplayContext->vaIsValid(pDisplayContext); -} #ifdef ANDROID VAStatus vaPutSurface ( diff --git a/va/va.c b/va/va.c index def7200..97fb753 100644 --- a/va/va.c +++ b/va/va.c @@ -64,7 +64,7 @@ extern int trace_flag; #define VA_MINOR_VERSION (31) #define VA_VERSION_S "0.31.1" -static int vaDisplayIsValid(VADisplay dpy) +int vaDisplayIsValid(VADisplay dpy) { VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; return pDisplayContext && (pDisplayContext->vadpy_magic == VA_DISPLAY_MAGIC) && pDisplayContext->vaIsValid(pDisplayContext); diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c index 8aa922c..9a7135c 100644 --- a/va/x11/va_x11.c +++ b/va/x11/va_x11.c @@ -219,12 +219,6 @@ VADisplay vaGetDisplay ( #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext) #define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; } -static int vaDisplayIsValid(VADisplay dpy) -{ - VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; - return pDisplayContext && (pDisplayContext->vadpy_magic == VA_DISPLAY_MAGIC) && pDisplayContext->vaIsValid(pDisplayContext); -} - VAStatus vaPutSurface ( VADisplay dpy, VASurfaceID surface, -- cgit v1.2.1