Merge from trunk:0.2.5

- Fix license terms.
- Render pretty background only in use-reflection=true mode.

3 files changed, 53 insertions, 31 deletions

diff --git a/NEWS b/NEWS
index b1164f20..5bc3b395 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
-gst-vaapi NEWS -- summary of changes.  2010-07-01
+gst-vaapi NEWS -- summary of changes.  2010-07-20
 Copyright (C) 2010 Splitted-Desktop Systems
 
-Version 0.2.5 - 01.Jul.2010
+Version 0.2.5 - 20.Jul.2010
 * Fix build with older VA-API 0.29-sds
 * Fix decoding of some H.264 streams. e.g. Ice Age 2 trailer
 * Fix VA/GLX support with texture-from-pixmap and GLX version < 1.3
diff --git a/debian.upstream/copyright b/debian.upstream/copyright
index 94da1e12..a7b3a141 100644
--- a/debian.upstream/copyright
+++ b/debian.upstream/copyright
@@ -1,34 +1,55 @@
 This package is maintained by:
 Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
 
+Copyright:
+
+    gstreamer-vaapi helper libraries
+    gst-libs/gst/vaapi/*.[ch]: LGPL (v2.1 or later)
+
+    gstreamer-vaapi plugin elements
+    gst/vaapi{convert,decode,sink}: GPL (v2 or later)
 
 License:
 
-    Copyright (C) 2009, Splitted-Desktop Systems.
-    All rights reserved.
-
-    Redistribution.  Redistribution and use in binary form, without 
-    modification, are permitted provided that the following conditions are 
-    met:
-
-    * Redistributions must reproduce the above copyright notice and the
-      following disclaimer in the documentation and/or other materials
-      provided with the distribution.
-    * Neither the name of Splitted-Desktop Systems nor the names of its
-      suppliers may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-    * No reverse engineering, decompilation, or disassembly of this software 
-      is permitted.
-
-    DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-    CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-    BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-    OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    DAMAGE.
+    Copyright (C) 2010, Splitted-Desktop Systems.
+
+    gstreamer-vaapi helper libraries are available under the terms of
+    the GNU Lesser General Public License v2.1+.
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public License
+    as published by the Free Software Foundation; either version 2.1
+    of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+    gstreamer-vaapi plugin elements are available under the terms of
+    the GNU General Public License v2+.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/gst/vaapisink/gstvaapisink.c b/gst/vaapisink/gstvaapisink.c
index 088999a1..fc86ec0a 100644
--- a/gst/vaapisink/gstvaapisink.c
+++ b/gst/vaapisink/gstvaapisink.c
@@ -631,7 +631,8 @@ gst_vaapisink_show_frame_glx(
     if (target != GL_TEXTURE_2D || !texture)
         return FALSE;
 
-    render_background(sink);
+    if (sink->use_reflection)
+        render_background(sink);
 
     glEnable(target);
     glBindTexture(target, texture);