[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090609-1-16-gde308c2

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 561ce0bdeafb222625889ea1bd3cb8905f29d006
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 09:57:58 2009 +0200

    Document the copyright notice and license for the VDPAU headers in debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index f82d637..0534089 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -94,3 +94,31 @@ On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
 
+The VDPAU headers found in `debian/include/vdpau' were downloaded from
+<ftp://download.nvidia.com/XFree86/vdpau/include/vdpau/>.
+For them the following copyright notice and license apply:
+
+ * This copyright notice applies to this header file:
+ *
+ * Copyright (c) 2008 NVIDIA Corporation
+ *
+ * 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, sublicense, 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 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
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS 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.

-- 
FFmpeg packaging