From fffeffb8a78fffbb6a7ddf587554f7d2d76aa692 Mon Sep 17 00:00:00 2001 From: Austin Yuan Date: Mon, 30 May 2011 19:02:25 -0700 Subject: libva: several changes 1) add free_drawable 2) clean the license of Android.mk 3) define VA_ROTATION_270 to 3 instead of 4 Signed-off-by: Zhaohan Ren Signed-off-by: Austin Yuan --- va/android/Makefile.am | 38 ++++++++++++++++++++------------------ va/android/va_android.cpp | 3 +++ 2 files changed, 23 insertions(+), 18 deletions(-) (limited to 'va/android') diff --git a/va/android/Makefile.am b/va/android/Makefile.am index f7ca6f1..8e532ac 100644 --- a/va/android/Makefile.am +++ b/va/android/Makefile.am @@ -1,22 +1,24 @@ -# INTEL CONFIDENTIAL -# Copyright 2007 Intel Corporation. All Rights Reserved. +# Copyright (c) 2007 Intel Corporation. All Rights Reserved. # -# The source code contained or described herein and all documents related to -# the source code ("Material") are owned by Intel Corporation or its suppliers -# or licensors. Title to the Material remains with Intel Corporation or its -# suppliers and licensors. The Material may contain trade secrets and -# proprietary and confidential information of Intel Corporation and its -# suppliers and licensors, and is protected by worldwide copyright and trade -# secret laws and treaty provisions. No part of the Material may be used, -# copied, reproduced, modified, published, uploaded, posted, transmitted, -# distributed, or disclosed in any way without Intel's prior express written -# permission. -# -# No license under any patent, copyright, trade secret or other intellectual -# property right is granted to or conferred upon you by disclosure or delivery -# of the Materials, either expressly, by implication, inducement, estoppel or -# otherwise. Any license under such intellectual property rights must be -# express and approved by Intel in writing. +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sub license, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice (including the +# next paragraph) shall be included in all copies or substantial portions +# of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 $(DRM_CFLAGS) diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp index c0c2ded..190d444 100644 --- a/va/android/va_android.cpp +++ b/va/android/va_android.cpp @@ -321,6 +321,9 @@ VAStatus vaPutSurface ( if (fool_postp) return VA_STATUS_SUCCESS; + if (draw == NULL) + return VA_STATUS_ERROR_UNKNOWN; + CHECK_DISPLAY(dpy); ctx = CTX(dpy); -- cgit v1.2.3