--- mplayer-1.0~rc3+svn20090426.orig/debian/README.upstream-upgrade
+++ mplayer-1.0~rc3+svn20090426/debian/README.upstream-upgrade
@@ -0,0 +1,44 @@
+Checklist and howto for mplayer upstream upgrades:
+
+Needed packages:
+
+  apt-get install devscripts git-buildpackage pristine-tar
+
+Stage in a tmp directory:
+
+  mkdir /tmp/m ; cd /tmp/m
+  git clone git://git.debian.org/git/pkg-multimedia/mplayer.git
+  cd mplayer
+  branches="master.unstripped pristine-tar upstream upstream.unstripped"
+  for b in $branches; do git checkout -b $b origin/$b ; done
+
+Prepare the environment:
+
+  SVNDATE=`date +%Y%m%d`
+  git checkout master
+
+Fetch and commit the new upstream version:
+
+  debian/rules get-orig-source SVN_VERSION=${SVNDATE}
+  git-import-orig \
+            --debian-branch=master \
+            --upstream-branch=upstream \
+            --pristine-tar \
+            --no-dch \
+            --upstream-version=1.0~rc3+svn${SVNDATE} \
+            --upstream-tag=upstream/1.0rc3+svn${SVNDATE} \
+            ../mplayer_1.0~rc3+svn${SVNDATE}.orig.tar.gz
+
+  git checkout master.unstripped
+  git-import-orig \
+            --debian-branch=master.unstripped \
+            --upstream-branch=upstream.unstripped \
+            --pristine-tar \
+            --no-dch \
+            --upstream-tag=upstream.unstripped/1.0rc3+svn${SVNDATE}-unstripped \
+            --upstream-version=1.0~rc3+svn${SVNDATE}-unstripped \
+            ../mplayer-non-dfsg_1.0~rc3+svn${SVNDATE}.orig.tar.gz
+
+  git checkout master
+
+more comments will follow..
--- mplayer-1.0~rc3+svn20090426.orig/debian/copyright
+++ mplayer-1.0~rc3+svn20090426/debian/copyright
@@ -0,0 +1,835 @@
+----- Debian package
+
+This package was first  debianized by * TeLeNiEkO * telenieko@telenieko.com on
+Mon, 26 Feb 2001 12:24:04 +0100.
+
+The current Debian Mantainer is: Dariush Pietrzak <eyck@ghost.anime.pl>
+sponsored by: A Mennucci <mennucc1@debian.org>
+
+Dariush Pietrzak and A Mennucci hold copyright (c) on the Debian
+packaging, that is available under the terms of GNU GPL v2 (see below
+for header).
+
+Original source can be found at: http://www.mplayerhq.hu/
+but (!) the orig.tar.gz contained in Debian is not the 
+upstream one. See README.Debian for details.
+
+MPlayer was originally written by Árpád Gereöffy and has been extended and
+worked on by many more since then; see the AUTHORS file for an (incomplete)
+list.
+
+----- Copyright of MPlayer
+
+MPlayer  is nowadays copyrighted by the MPlayer team ;
+this copyright applies to code written specifically for MPlayer
+(see (*) below for the list exceptions).
+
+----- License of MPlayer
+
+MPlayer is licensed under the terms of GNU GPL v2 ;the licence header is:
+
+    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 St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public
+License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+This license applies to code written specifically for MPlayer;
+(see (*) below for the list exceptions).
+
+---- (*) Other License and Copyright
+
+MPlayer includes code from several external sources; this is shipped
+in subdirectories; (summarized) copyrights and licenses are as follows:
+
+Name:       FFmpeg
+Version:    CVS snapshot
+Homepage:   http://www.ffmpeg.org
+Directory:  libavcodec, libavformat, libavutil, libpostproc
+Copyright (c)  The ffmpeg Project
+	  (see individual files for other copyrights)
+License:    GNU Lesser General Public License, some parts GNU General Public
+            License, GNU General Public License when combined
+
+Name:       FAAD2
+Version:    2.1 beta (20040915 CVS snapshot) + fixes and portability patches
+Homepage:   http://www.audiocoding.com
+Directory:  libfaad2
+Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
+License:    GNU General Public License
+
+Name:       GSM 06.10 library
+Version:    patchlevel 10
+Homepage:   http://kbs.cs.tu-berlin.de/~jutta/toast.html
+Copyright 1992 by Jutta Degener and Carsten Bormann,  Technische Universitaet Berlin
+Directory:  libmpcodecs/native/
+License:
+ Any use of this software is permitted provided that this notice is
+ not removed and that neither the authors nor the Technische
+ Universitaet Berlin are deemed to have made any representations as to
+ the suitability of this software for any purpose nor are held
+ responsible for any defects of this software.  THERE IS ABSOLUTELY NO
+ WARRANTY FOR THIS SOFTWARE.
+ As a matter of courtesy, the authors request to be informed about
+ uses this software has found, about bugs in this software, and about
+ any improvements that may be of general interest.
+ .
+ As of the libgsm debian package version 1.0.13-1, the following
+ copyright addition has been made to the libgsm package:
+ .
+ Since the original terms of 15 years ago maybe do not make our
+ intentions completely clear given today's refined usage of the legal
+ terms, we append this additional permission:
+ .
+      Permission to use, copy, modify, and distribute this software
+      for any purpose with or without fee is hereby granted,
+      provided that this notice is not removed and that neither
+      the authors nor the Technische Universitaet Berlin are
+      deemed to have made any representations as to the suitability
+      of this software for any purpose nor are held responsible
+      for any defects of this software.  THERE IS ABSOLUTELY NO
+      WARRANTY FOR THIS SOFTWARE.
+ .
+ Berkeley/Bremen, 05.04.2009
+ Jutta Degener
+ Carsten Bormann
+
+Name:       miniLZO
+Version:    1.07
+Homepage:   http://www.oberhumer.com/opensource/lzo/#minilzo
+File:	    libmpcodecs/native/minilzo.c libmpcodecs/native/minilzo.h
+Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
+License:    GNU General Public License
+
+Name:       liba52
+Version:    0.7.4 + patches
+Homepage:   http://liba52.sourceforge.net/
+Directory:  liba52
+Copyright (C) 2000-2001 Michel Lespinasse <walken@zoy.org>
+Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
+License:    GNU General Public License
+
+Name:       libmpeg2
+Version:    0.4.0b + patches
+Homepage:   http://libmpeg2.sourceforge.net/
+Directory:  libmpeg2
+Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
+Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
+Copyright (C) 2003 David S. Miller <davem@redhat.com>
+Copyright (c) 2002-2003 Falk Hueffner <falk@debian.org>
+License:    GNU General Public License
+
+Name:       mpg123
+Version:    0.59s + significant changes
+Homepage:   http://www.mpg123.de/
+Directory:  mp3lib
+Copyright (c) 1995 by Michael Hipp
+License:    GNU General Public License
+
+Name:       Tremor
+Version:    1.0 + parts CVS from December 2004 + patches
+Homepage:   http://xiph.org/
+Directory:  tremor
+Copyright (c) 2002, Xiph.org Foundation
+License:    BSD-like:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ 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 FOUNDATION
+ 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.
+
+Name:       avifile DLL loader
+Version:    0.47 + patches + CVS updates
+Homepage:   http://avifile.sourceforge.net/
+Directory:  loader/
+Copyright 1995 Alexandre Julliard
+Copyright 1994    Eric Youndale & Erik Bos
+Copyright 1996-98 Marcus Meissner
+Copyright 1995 Thomas Sandford
+Copyright 1996 Martin von Loewis
+Copyright 1993 Robert J. Amstadt
+Copyright 1995-1996 Alexandre Julliard
+Copyright 2000-2001 Eugene Kuznetsov  (divx@euro.ru)
+License:    GNU General Public License
+
+Name:       dvbstream
+Version:    0.4.3-pre3 (cvs checkout)
+Homepage:   http://www.linuxstb.org/dvbstream/
+	    now at http://prdownloads.sourceforge.net/dvbtools/
+File:	    libmpdemux/dvbin.h  libmpdemux/dvbin.c libmpdemux/rtp.h
+Copyright (C) 2002 the xine project
+License:    GNU General Public License
+
+Name:       librtsp
+Version:    xine CVS 2003/04/10 + patches
+Homepage:   http://www.xinehq.de
+Directory:  stream/librtsp/
+Copyright (C) 2000-2002 the xine project
+License:    GNU General Public License
+
+Name:       realrtsp
+Version:    xine CVS 2003/04/17 + patches
+Homepage:   http://www.xinehq.de
+Directory:  stream/realrtsp/
+Copyright (C) 2000-2002 the xine project
+License:    GNU General Public License
+
+Name:       id3edit
+Version:    1.9 + patches
+Homepage:   http://id3edit.sourceforge.net/
+Directory:  libmpdemux/genres.h
+Copyright (C) 2001  Jason Carter
+License:    GNU General Public License
+
+Name:       matroxset
+Version:    0.3
+Homepage:   ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/
+Directory:  TOOLS/TVout/matroxset/
+License:    GNU General Public License
+
+Name:       unrarlib
+Version:    0.4.0 + patches
+Homepage:   http://www.unrarlib.org/
+File:	    unrarlib.[ch]
+Copyright (C) 2000-2002 by Christian Scheurer (www.ChristianScheurer.ch)
+  UNIX port copyright (c) 2000-2002 by Johannes Winkelmann (jw@tks6.net)
+License:    GNU General Public License / UniquE RAR File Library License
+
+Name:       uCIFS library
+Version:    development files as of september 2004
+Homepage:   http://ubiqx.org/libcifs/
+Directory:  libvo/md5sum.[ch]
+License:    GNU Lesser General Public License
+
+Name:       FreeSDP
+Version:    0.4.1
+Homepage:   https://savannah.nongnu.org/projects/freesdp/
+Directory:  stream/freesdp/
+Copyright (C) 2001,2002,2003 Federico Montesino Pouzols <fedemp@suidzer0.org>
+License:    GNU General Public License
+
+--- libmpdemux
+libmpdemux is itself a collection of code from different sources
+
+File:	    libmpdemux/pnm.c libmpdemux/pnm.h
+Copyright (C) 2000-2002 the xine project
+License:    GNU General Public License
+
+File:	    libmpdemux/demux_avs.c libmpdemux/demux_avs.h 
+Copyright (c) 2005 Gianluigi Tiesi <sherpya@netfarm.it>
+Copyright 2003 Kevin Atkinson
+License:    GNU General Public License
+
+
+Name:	    lavtools
+File:	    libmpdemux/yuv4mpeg.h
+Home:	  mjpeg.sourceforge.net
+Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com>
+License:    GNU General Public License
+
+
+Name:   XMMS - Cross-platform multimedia player
+File:  libmpdemux/demux_xmms_plugin.h
+Copyright (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
+License:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer. 2.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+
+--- TOOLS
+
+In the TOOLS directory you can find some nice scripts and code that
+makes using MPlayer and MEncoder easier, for example scripts for DVD
+track encoding in three pass mode or creating SVCDs from a movie.
+
+MPlayer scripts in the TOOLS dir
+--------------------------------
+
+edgedetect.fp, emboss.fp
+
+Author:       Reimar Döffinger
+
+Description:  Examples of custom fragment program for OpenGL video out driver
+
+Usage:        mplayer -vo gl:yuv=4:customprog=edgedetect.fp
+
+
+midentify.sh
+
+Author:       Tobias Diedrich
+
+Description:  Runs 'mplayer -identify' for all arguments while preventing
+              video window flashing.
+
+Usage:        midentify.sh file1 [file2 ...]
+
+
+mpconsole.sh
+
+Author:       Rich Felker
+
+Description:  Script to run MPlayer on the console (fbdev/mga_vid/etc.) without
+              the console text and/or flashing cursor getting in the way.
+
+Usage:        mpconsole.sh [mplayer options]
+
+
+mplmult.sh
+
+Author:       Reimar Döffinger
+
+Description:  Example how to output video on multiple windows in sync. Might
+              be even more useful in combination with -vo ggi to distribute
+              the video arbitrarily.
+
+Usage:        mplmult.sh <n> <options>
+              n        Number of MPlayer instances that display the video.
+              options  Any options you would pass to MPlayer, more than
+                       one file will usually not work.
+
+
+subsearch.sh
+
+Author:       Alex Beregszaszi
+
+Description:  Collects subtitle files from the directory given as argument
+              ('.' if none is given) and its subdirectories and prints
+              them as a comma separated list to stdout.
+
+Usage:        subsearch.sh [directory]
+              mplayer -sub `subsearch.sh` movie
+
+
+wma2ogg.pl
+
+Author:       Peter Simon
+
+Description:  Converts WMA files to Ogg or MP3.
+
+Usage:        wma2ogg [options] <-f FILE1 | -f FILE2 ... | -a>
+              -f, -file   filename
+              -a          converts all WMA files in the current directory
+              -t          output filetype (ogg, mp3) [default=ogg]
+              -lame       I wanna use L.A.M.E. sure enough!
+              -br         bitrate (kb/s) [default=from the WMA]
+              -del        remove WMA file(s) after the transcoding
+
+
+
+MEncoder scripts in the TOOLS dir
+---------------------------------
+
+divx2svcd.sh
+
+Author:       Miklos Vajna
+
+Description:  A simple utility that creates an SVCD from a video in an AVI
+              container.
+
+Usage:        divx2svcd.sh <input_avi> [options]
+              see 'divx2svcd.sh -h' for more info
+
+
+mencvcd.sh
+
+Author:       Jürgen Hammelmann
+
+Description:  Converts DVD (or anything else that MPlayer plays) to (S)VCD
+
+Usage:        mencvcd.sh <basename> [mencvcd.sh options] [mplayer options]
+              see 'mencvcd.sh -h' for more info
+
+Note:         Requires MPlayer, mjpegtools, VCDImager, cdrdao, and optionally
+              LAME, tooLAME and SoX.
+
+
+dvd2divxscript.pl
+
+Author:       Florian Schilhabel
+
+Description:  Yet another DVD to divx helper script.
+              This script encodes a DVD track in three pass mode to MPEG-4 with
+              libavcodec. Optionally it writes the resulting movie file to
+              CD-ROM the corresponding audio track to MP3. It can also shut
+              down the computer when it finishes. If you like, you can
+              watch the MEncoder output on /dev/tty8.
+
+Usage:        --help       show help
+              --abr        (AudioBitRate) Please enter the desired bitrate this
+                           can be either [96|128|192] kbit/sec (default: 128).
+              --lang       Specify the Language of the audio track this can be
+                           for example <en> or <de> (default: <de>).
+              --dvd        Specify the DVD track you want to encode.
+              --cdsize     Specify the size of your CD-ROM (default: 700MB).
+              --shutdown   Shutdown the system, when the encoding process has
+                           finished. Needs appropriate privileges.
+              --out        Specify the name of your encoded movie. The file
+                           extension will be appended automatically.
+              --writecd    Takes the newly created movie and writes it to a
+                           CD-ROM.
+              --writedev   cdrecord device identifier, for example 0,1,0
+              --speed      writing speed (default: 4)
+              --dvd-device device to pull the video off (default: /dev/dvd)
+
+
+aconvert.sh
+
+Author:       Jonas Jermann
+
+Description:  A hack to allow MEncoder to read respectively encode from audio
+              only files.
+
+Usage:        aconvert.sh <"input file"> <"output file"> <"options">
+              If no options are specified the following is assumed:
+              -oac lavc -lavcopts acodec=mp3:abitrate=192
+
+Note:         The script is probably bash dependent and it's just a quick
+              hack, feel free to improve it (or much better: fix MEncoder ;).
+
+
+
+qepdvcd.sh
+
+Author:       Reynaldo H. Verdejo Pinochet
+
+Description:  converter from any supported format to VCD/SVCD PAL/NTSC
+
+Usage:        qepdvcd.sh file <options>
+              Run with no arguments to see the list of options.
+
+Note:         You will need vcdimager/cdrecord to master/burn the resulting
+              files.
+
+
+
+Tech scripts in the TOOLS dir
+-----------------------------
+
+calcbpp.pl
+
+Author:       Moritz Bunkus
+
+Description:  A script that calculates the $bpp for a movie, mentioned in
+              DOCS/tech/encoding-tips.txt, see that document for more info.
+
+Usage:        calcbpp.pl <resolution> <aspect ratio> <bitrate> <fps>
+              resolution:    the cropped but unscaled resolution
+                             (use '-vf cropdetect')
+              aspect ratio:  the encoded aspect ratio. All DVDs come at
+                             720x576 but contain a flag that tells the player
+                             wether it should display the DVD at an aspect
+                             ratio of 4/3 (1.333) or at 16/9 (1.777). Have a
+                             look at MPlayer's output - there's something
+                             about 'prescaling'. That's what you are looking
+                             for.
+              bitrate:       the video bitrate in kbit/s
+              fps:           the fps
+
+              example: calcbpp.pl 720x440 16/9 896 25
+
+
+countquant.pl
+
+Author:       Moritz Bunkus
+
+Description:  Counts the quantizers used for the encoding, mentioned in
+              DOCS/tech/encoding-tips.txt, see that document for more info.
+
+Usage:        countquant.pl < divx2pass.log
+              It will print out which quantizer was used how often. If you see
+              that e.g. the lowest quantizer (vqmin=2) gets used for > 95% of
+              the frames then you can safely increase your picture size.
+
+
+plotpsnr.pl
+
+Author:       Jonas Jermann
+
+Description:  Draw PSNR log graphs using gnuplot.
+
+Usage:        plotpsnr.pl [options] <file>
+              -h, --help    Display this help message
+              -quant        Display quantizers
+              -size         Display size
+              -psnr         Display PSNR
+              -iframes      Display I-frames
+              -pframes      Display P-frames
+              -bframes      Display B-frames
+              -aframes      Display all frames in different colors
+              -cmp <file2>  Compare two files
+              -qs <style>   Quantizer style
+              -ss <style>   Size style
+              -ps <style>   PSNR style
+
+              Default: -quant -size -psnr -qs "p" -ss "i" -ps "p"
+
+Note:         Requires gnuplot. Comparison is based on file2. Comparison
+              assumes that the frame numbers of both files fit.
+
+
+psnr-video.sh
+
+Author:       Matthias Wieser
+
+Description:  Calculates the PSNR between two existing video files.
+              The PSNR is calculated frame by frame.
+              Also prints the overall PSNR.
+              The script can be used to:
+               * Compare different softwarescalers (should I use
+                 -sws 1 or -sws 2 ?)
+               * Compare different resolutions (is it better to scale
+                 down to 640x360 or to 560x320)
+               * Compare different deinterlacers
+               * Compare different video codecs
+               * Compare video filters (is it better to use -vf hqdn3d
+                 or lavcopts:nr=400)
+               * [...]
+
+Usage:        psnr-video.sh <file1> <file2> [<frames>] [<options1>] [<options2>]
+
+              <file1> and <file2> are the video files for which the PSNR
+                should be calculated.
+              [<frames>] is the number of frames to process, starting
+                from frame 1.
+              [<options1>] are additional MPlayer options for <file1>
+              [<options2>] are additional MPlayer options for <file2>
+
+              A file called ./psnr.dat will be created with the following
+              content:
+
+              File;Y;Cb;Cr
+              00000001.ppm;34.23;39.54;40.06;35.426
+              00000002.ppm;33.03;38.71;39.26;34.271
+              00000003.ppm;33.45;38.91;39.28;34.655
+              00000004.ppm;32.72;38.69;38.85;33.972
+              [...]
+              00000247.ppm;35.55;40.84;42.15;36.785
+              PSNR:;35.9887
+
+Note:         This script relies on the the tool "pnmpsnr" for the
+              frame-by-frame PSNR calculation.
+              Be aware that psnr-video.sh needs a lot of temporary space
+              in /tmp/.
+
+
+asfinfo
+
+Author:       Arpi
+
+Description:  a simple ASF header display program
+
+Usage:        asfinfo <filename.asf>
+
+Note:         Also see MPlayer's -identify option.
+
+
+avi-fix
+
+Author:       Arpi
+
+Description:  A simple tool to fix chunk sizes in RIFF AVI files.
+
+Usage:        avi-fix [-fix] <badfile.avi>
+
+Note:         It does not check or fix the index, to do this use
+              'mencoder -forceidx -oac copy -ovc copy'.
+
+
+checktree.sh
+
+Author:       Ivo van Poorten
+
+Description:  Check the source tree for anomalies.
+
+Usage:        checktree.sh -help
+
+Note:         This script is meant for developers to check the current
+              source tree and/or the patches they are working on.
+
+
+mphelp_check.py
+
+Author:       Uoti Urpala
+
+Description:  Check console message translations for common errors.
+
+Usage:        mphelp_check.py [--missing] <master file> <files to check>
+
+Note:         Compares MPlayer translation files against a master file and
+              reports conflicting arguments, extra strings not present in
+              the base file and (optionally) missing strings.
+
+
+cpuinfo
+
+Author:       Jürgen Keil
+
+Description:  the prototype ../cpuinfo.c
+
+Note:         Used by configure to emulate /proc/cpuinfo on non-Linux systems.
+
+
+dump_mp4
+
+Author:       Arpi
+
+Description:  MPEG4-ES stream inspector, dumps the stream startcodes.
+
+
+fastmemcpybench
+
+Author:       Felix Bünemann
+
+Description:  benchmark/testbed for fastmemcpy stuff
+
+Note:         Also see fastmem.sh.
+
+
+movinfo
+
+Author:       Arpi
+
+Description:  Show QuickTime MOV file structure.
+
+Usage:        movinfo <filename.mov>
+
+
+vivodump
+
+Author:       Arpi
+
+Description:  Dump H.263 frame headers from VIVO files.
+
+Usage:        vivodump <input_file> <output_file>
+
+
+
+Miscellaneous scripts in the TOOLS dir
+--------------------------------------
+
+subedit.pl
+
+Author:       Michael Klepikov
+
+Description:  A script for pipelined editing of subtitle files.
+
+Usage:        subedit.pl [switches]
+    -if,--input-format <fmt>   input format; supported: SRT (default: SRT)
+    -of,--output-format <fmt>  output format; supported: SRT
+                               (default: input format)
+    -s,--shift <time>          shift all subtitles by <time>
+                               (format: [-]hh:mm:ss,fraction)
+    -c,--scale <time>          scale by adding <time> to overall duration
+    -f,--split-from <time>     drop subtitles that end before <time>
+    -t,--split-to <time>       drop subtitles that start after <time> (will
+                               truncate timing if it overlaps a boundary)
+    -r,--renumber              renumber SRT subtitles in output
+    -d,--debug                 enable debug output
+    -h,--help                  help message
+
+
+w32codec_dl.pl
+
+Author:       Tom Lees
+
+Description:  This script will use the Windows Media Player codec download
+              infrastructure to aquire the codecs listed in codecs.conf and put
+              them in a directory named "codecs/" below the current directory.
+
+Usage:        w32codec_dl.pl <codecs.conf location>
+
+Note:         You will need the libwww-perl stuff and the cabextract utility
+              which can be found at http://www.kyz.uklinux.net/cabextract.php3.
+
+
+binary_codecs.sh
+
+Author:       Andrea Menucci, thuglife
+
+Description:  Downloads binary codecs from mplayerhq.hu and installs them
+              on a Debian system.
+
+Usage:        binary_codecs.sh install
+              binary_codecs.sh uninstall
+
+
+vobshift.py
+
+Author:       Gábor Farkas
+
+Description:  Adjust the time-info in vobsub files
+
+Usage:        vobshift.py in.idx out.idx +8.3
+              Will shift the time by 8.3 seconds
+
+
+subrip.c
+
+Author:       Kim Minh Kaplan
+
+Description:  Transform VOBsub subtitles into Subrip text subtitles using
+              GOCR/JOCR.
+
+Usage:        subrip <vobsub basename> [subid [output filename] ]
+
+Note:         Requires at least JOCR/GOCR 0.37.
+              You will have to change the 'vobsub_id' value if you want a
+              subtitle different from number 0. Hint: You can view the
+              subtitle that is being decoded with "display subtitle-*.pgm".
+
+
+alaw-gen.c
+
+Author:       Arpi
+
+Description:  Generates alaw/ulaw tables.
+
+Note:         Created to work around a past license issue, no longer useful.
+
+
+avisubdump.c
+
+Author:       Tobias Diedrich
+
+Description:  Dumps vobsub soft subtitles streams embedded in AVI files.
+
+Usage:        avisubdump <movie.avi>
+
+
+vfw2menc.c
+
+Author:       Gianluigi Tiesi
+
+Description:  Creates a codec settings file from the Video for Windows codecs
+              found in the mplayer codec packs.
+
+Usage:        vfw2menc -f <fourcc> -d <codec.dll> -s <settingsfile.mcf>
+              -h|--help            - displays this help
+              -d|--driver filename - dll or drv to load
+              -f|--fourcc fourcc   - fourcc of selected driver
+              -s|--save filename   - save settings to file
+              -c|--check filename  - load and show setting in filename
+              -v|--view            - displays the config dialog and do nothing
+
+Notes:        Works on Windows/Linux x86 only.
+
+
+modify_reg.c
+
+Author:       Alan Nisota
+
+Description:  Modifies registry file (usually ~/.mplayer/registry)
+
+Usage:        modify_reg -r <registry_file> -l
+              modify_reg -r <registry_file> -k <key> [-d|-v <value>[-t <type>]]
+              -r|--registry - path to registry file
+              -l|--list     - shows all keys and values
+              -k|--key      - registry key
+              -d|--del      - delete key
+              -v|--value    - new value for key
+              -t|--type     - key type: string (default) or dword
+
+Notes:        Necessary to use CoreAVC with MPlayer
+
+
+compare.c
+
+Author:       Michael Niedermayer
+
+Description:  Simple file compare program that detects the number of rounding
+              errors and dies if the error is too large.
+
+Usage:        compare <file1> <file2>
+
+
+realcodecs/
+
+Author:       miscellaneous
+
+Description:  Wrappers for Linux Real binary codecs used to analyze, alter and
+              dump the data flow between RealPlayer and its codecs.
+
+Usage:        - Set the path to the RealPlayer codecs directory in the C files.
+              - Run 'make realcodecs'.
+              - Rename the original codecs to match the names expected in the
+                wrapper sources. The default is to give them a "real" prefix,
+                e.g. realcook.so.6.0.
+              - Put the wrappers in the RealPlayer codecs directory.
+
+Notes:        Known to work at least on Linux x86 with RealPlayer8.
+
+
+
+netstream - access remote streams
+---------------------------------
+
+NOTE: netstream does not link at the moment - help welcome.
+
+netstream allows you to access most MPlayer stream types from a remote host.
+The main purpose of this feature is to make it possible to directly use the
+CD or DVD drive of another computer on the network (provided you have the
+required bandwidth). On the downside some stream types (currently TV and MF)
+are not usable remotely because they are implemented at the demuxer level.
+
+Be aware that currently the server is not secure at all.
+
+Compile the server by running 'make netstream' and then copy the netstream
+binary to the right place on your system (usually /usr/local/bin on Unix).
+Start the netstream server on the computer you intend to access remotely.
+There are no command line arguments.
+
+Play the second track of a VCD on the server with:
+
+  mplayer -cache 5000 mpst://servername/vcd://2
+
+Access files on this server with:
+
+  mplayer -cache 5000 mpst://servername//usr/local/movies/lol.avi
+
+Note that paths which do not start with a / will be interpreted as relative to
+the directory where the server is running. The '-cache' option is not needed
+but highly recommended.
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.doc-base.en
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.doc-base.en
@@ -0,0 +1,11 @@
+Document: mplayer-en
+Title: MPlayer documentation (English)
+Author: The MPlayer team
+Abstract: This documentation describes the use of MPlayer. (English)
+ MPlayer is a movie player for GNU/Linux that supports a wide
+ range of audio and video formats, and output drivers.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/mplayer-doc/HTML/en/index.html
+Files: /usr/share/doc/mplayer-doc/HTML/en/*.html
--- mplayer-1.0~rc3+svn20090426.orig/debian/rules
+++ mplayer-1.0~rc3+svn20090426/debian/rules
@@ -0,0 +1,288 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# do not run the actual rules of this makefile in parallel. sub-makes
+# can go in parallel
+.NOTPARALLEL:
+
+############
+
+DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
+SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-~]+svn([0-9]+)$$/\1/p')
+
+
+#UPSTREAMSOURCE := upstream SVN repository
+UPSTREAMSOURCE := http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_CPU   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+
+## This can be overridden from the command line, see README.Debian.
+DEB_BUILD_CONFIGURE = \
+	--disable-bitmap-font \
+	--disable-ggi \
+	--language=all \
+	--disable-xmms \
+	--disable-arts \
+	--disable-aa \
+	--disable-mad \
+	--disable-musepack \
+	--disable-libdv \
+	--disable-libavutil_a \
+	--disable-libavcodec_a \
+	--disable-libavformat_a \
+	--disable-libpostproc_a \
+	--disable-libswscale_a \
+	--enable-mp3lame \
+	--enable-faac-lavc \
+	--enable-x264-lavc \
+	--enable-mp3lame-lavc \
+	--enable-libdirac-lavc \
+	--enable-libschroedinger-lavc \
+	$(archconf)
+
+# Choose whether we want binary codec support (default on unknown archs: no).
+with_real_and_xanim = false
+with_win32 = false
+
+ifeq ($(DEB_HOST_ARCH),i386)
+#Avoid high optimization through gcc.
+  archconf += --target=i586-linux
+  with_real_and_xanim = true
+  with_win32 = true
+  DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+  DEB_BUILD_CONFIGURE += --enable-vdpau
+endif
+ifeq ($(DEB_HOST_ARCH),amd64)
+  #this needs the patch 
+  # http://people.freedesktop.org/~jinghua/real64/mplayer-amd64-real-codecs.diff
+  with_real_and_xanim = true
+  #this does not compile, though : with_win32 = true
+  DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+  DEB_BUILD_CONFIGURE += --enable-vdpau
+endif
+ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
+  with_real_and_xanim = true
+  DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
+  with_real_and_xanim = true
+  DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),powerpc)
+  with_real_and_xanim = true
+  DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),alpha)
+#Avoid high optimization through gcc.
+# see http://permalink.gmane.org/gmane.linux.debian.ports.alpha/7295
+  archconf += --target=alpha_ev5-linux
+  with_real_and_xanim = true
+endif
+ifeq ($(with_win32),false)
+  archconf += --disable-win32dll
+else
+  archconf += --enable-win32dll
+endif
+ifeq ($(with_real_and_xanim),false)
+  archconf += --disable-real --disable-xanim
+else
+  archconf += --enable-real --enable-xanim
+endif
+
+ifeq ($(DEB_SOURCE),mplayer)
+DEB_BUILD_CONFIGURE += --disable-libdvdcss-internal --enable-dvdread
+endif
+
+# generate debugging symbols for mplayer-dbg for all archs but mipsen,
+# see bug #520113
+ifeq (,$(findstring mips,$(DEB_HOST_ARCH)))
+DEB_BUILD_CONFIGURE += --enable-debug
+endif
+
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+         NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+         MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+    DEB_BUILD_CONFIGURE += --enable-tv-v4l2 --enable-xmga --enable-mga
+    DEB_BUILD_CONFIGURE += --enable-3dfx --enable-tdfxfb --enable-fbdev
+endif
+ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
+    DEB_BUILD_CONFIGURE += --enable-tv-bsdbt848 --disable-directfb
+endif
+
+####### build-arch
+
+COMMON_CONFIGURE_FLAGS = \
+	--prefix=/usr \
+	--confdir=/etc/mplayer \
+	--datadir=/usr/share/mplayer \
+	--codecsdir=/usr/lib/codecs \
+	--enable-xvmc \
+	--enable-vdpau \
+	--enable-sdl \
+	--enable-ossaudio \
+	--enable-lirc \
+	--enable-freetype \
+	--enable-menu \
+	--enable-largefiles
+
+# We add vdpau headers ourselves so mplayer can stay in main
+COMMON_CONFIGURE_FLAGS += --extra-cflags="-I$(CURDIR)/debian/include"
+
+# See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282  and
+# https://wiki.ubuntu.com/DistCompilerFlags
+CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS
+
+
+# this rule is used for both architecture independent and dependent
+# builds. When building only the doc package, it still needs the first
+# configure run done.
+configure: configure-arch-stamp
+configure-arch-stamp: $(QUILT_STAMPFN)
+	dh_testdir
+	test -r .svnrevision && cp .svnrevision snapshot_version
+	# Add commands to configure the package here.
+	$(CLEAN_ENV) \
+	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE)
+	touch configure-arch-stamp
+
+install-arch: $(QUILT_STAMPFN)
+	dh_testdir
+	[ ! -f config.mak ] || $(MAKE) distclean
+	$(CLEAN_ENV) \
+	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui
+	$(CLEAN_ENV) \
+	$(MAKE)
+	# build non-gui version
+	dh_prep -a
+	$(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer-nogui
+	$(MAKE) install-mplayer-man-en DESTDIR=$(CURDIR)/debian/mplayer-nogui
+	install -D -m 644 debian/mplayer.conf \
+	                  $(CURDIR)/debian/mplayer-nogui/etc/mplayer/mplayer.conf
+	install -D -m 644 debian/apport-hook.py \
+	                  $(CURDIR)/debian/mplayer-nogui/usr/share/apport/package-hooks/source_mplayer.py
+	#install mencoder
+	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
+	dh_link -p mencoder usr/share/man/man1/mplayer.1.gz usr/share/man/man1/mencoder.1.gz
+	# build gui version
+	[ ! -f config.mak ] || $(MAKE) distclean
+	$(CLEAN_ENV) \
+	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
+	$(CLEAN_ENV) \
+	$(MAKE)
+	install -D -m 755 mplayer $(CURDIR)/debian/mplayer/usr/bin/gmplayer
+	install -D -m 655 etc/mplayer.desktop \
+	                  $(CURDIR)/debian/mplayer/usr/share/applications/mplayer.desktop
+	install -D -m 655 etc/mplayer.xpm \
+	                  $(CURDIR)/debian/mplayer/usr/share/pixmaps/mplayer.xpm
+	install -D -m 644 DOCS/man/en/mplayer.1 \
+	                  $(CURDIR)/debian/mplayer/usr/share/man/man1/gmplayer.1
+
+###### build-indep
+
+# commands to compile the documentation
+install-indep: install-indep-stamp
+install-indep-stamp: configure-arch-stamp
+	dh_testdir
+	cd DOCS/xml && ./configure
+	$(CLEAN_ENV) \
+	$(MAKE) -C DOCS/xml html-chunked
+	dh_prep -i
+	$(MAKE) install-mplayer-gui-man DESTDIR=$(CURDIR)/debian/mplayer-doc
+	$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer-doc
+	# Drop the english manpage, installed in each mplayer package
+	rm -v $(CURDIR)/debian/mplayer-doc/usr/share/man/man1/mplayer.1
+	rm -v $(CURDIR)/debian/mplayer-doc/usr/share/man/man1/mencoder.1
+	dh_installdocs -i
+	touch $@
+
+################ clean
+
+clean: clean-real unpatch
+clean-real:
+	dh_testdir
+	dh_testroot
+	[ ! -f config.mak ] || $(MAKE) -C DOCS/xml distclean || true
+	[ ! -f config.mak ] || $(MAKE) distclean
+	dh_clean build-arch-stamp configure-arch-stamp snapshot_version
+	dh_clean debian/README.Debian
+
+###### 	Write README.Debian and add free or non-free statement.
+debian/README.Debian:
+ifeq ($(DEB_SOURCE),mplayer)
+	tail -n +4  debian/README.Debian.free > $@
+else
+	tail -n +4  debian/README.Debian.nonfree > $@
+endif
+	cat debian/README.Debian.all >> $@
+	sed 's!@DEB_BUILD_CONFIGURE@!$(DEB_BUILD_CONFIGURE)!' \
+	  <  debian/README.Debian \
+	  >> $@.tmp
+	mv $@.tmp $@
+
+binary-common: debian/README.Debian
+	dh_testdir
+	dh_testroot
+	dh_install
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installmime
+	dh_installinit
+	dh_installman
+	dh_desktop
+	dh_strip --dbg-package=mplayer-dbg
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+
+
+# Build architecture-independent packages using the common target.
+binary-indep: install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture-dependent packages using the common target.
+binary-arch: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-indep binary-arch
+
+###############################################
+##These targets generate the DFSG-free tar.gz.
+## They are not automatically invoked.
+
+get-orig-source:
+	dh_testdir
+	# strip patented code
+	chmod +x debian/strip.sh
+	sh debian/get-orig-source.sh -d $(SVN_VERSION)
+
+PHONY += build clean binary-indep binary-arch binary-common binary 
+PHONY += install binary binary-arch binary-indep clean checkroot get-orig-source
+PHONY += autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig
+PHONY += build-gui build-nogui install-gui install-nogui debian/README.Debian
+
+.PHONY: $(PHONY)
--- mplayer-1.0~rc3+svn20090426.orig/debian/control
+++ mplayer-1.0~rc3+svn20090426/debian/control
@@ -0,0 +1,184 @@
+Source: mplayer
+Section: video
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
+Uploaders: A Mennucc1 <mennucc1@debian.org>,
+           Reinhard Tartler <siretart@tauware.de>,
+           Andres Mejia <mcitadel@gmail.com>
+DM-Upload-Allowed: yes
+Standards-Version: 3.8.1
+Vcs-Git: git://git.debian.org/git/pkg-multimedia/mplayer.git
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mplayer.git;a=summary
+Homepage: http://www.mplayerhq.hu/
+Build-Depends: debhelper (>= 7),
+               docbook-xml,
+               docbook-xsl,
+               ladspa-sdk,
+               libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libaudio-dev,
+               libavcodec-dev (>= 0.svn20080206),
+               libavdevice-dev,
+               libavformat-dev,
+               libavutil-dev,
+               libcaca-dev,
+               libcdparanoia-dev | libcdparanoia0-dev,
+               libdirectfb-dev,
+               libdts-dev,
+               libdvdread-dev,
+               libesd0-dev,
+               libfaac-dev,
+               libfaad-dev,
+               libfontconfig1-dev,
+               libfreetype6-dev,
+               libfribidi-dev,
+               libgif-dev,
+               libgl1-mesa-dev,
+               libgtk2.0-dev,
+               libjack-dev,
+               libjpeg62-dev,
+               liblircclient-dev,
+               liblivemedia-dev,
+               liblzo2-dev,
+               libncurses5-dev,
+               libmp3lame-dev,
+               libopenal-dev,
+               libpng12-dev | libpng-dev,
+               libpostproc-dev,
+               libpulse-dev,
+               libschroedinger-dev,
+               libsdl1.2-dev | libsdl1.1-dev,
+               libsmbclient-dev,
+               libspeex-dev,
+               libsvga1-dev [i386 amd64],
+               libswscale-dev,
+               libtheora-dev (>= 1.0~beta1),
+               libvorbis-dev,
+               libvorbisidec-dev,
+               libx11-dev,
+               libx264-dev,
+               libxext-dev,
+               libxinerama-dev,
+               libxv-dev,
+               libxvidcore4-dev,
+               libxvmc-dev,
+               libxxf86dga-dev,
+               libxxf86vm-dev,
+               nvidia-185-libvdpau-dev [i386 amd64],
+               pkg-config,
+               po-debconf,
+               quilt,
+               vstream-client-dev,
+               x11proto-core-dev,
+               xsltproc,
+               zlib1g-dev
+
+Package: mplayer
+Architecture: any
+Section: video
+Suggests: mplayer-doc,
+          ttf-freefont,
+          netselect | fping,
+          bzip2,
+          fontconfig
+Depends: debconf | debconf-2.0,
+         mplayer-skin,
+         mplayer-nogui,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: movie player for Unix-like systems
+ MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
+ ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
+ supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
+ also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
+ .
+ Another big feature of MPlayer is the wide range of supported output
+ drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
+ DirectFB, but also SDL (plus all its drivers) and some
+ low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
+ and Permedia3). Most of them support software or hardware scaling,
+ therefore allowing fullscreen display.  MPlayer is also able
+ to use some hardware MPEG decoder boards, such as the DVB
+ and DXR3/Hollywood+.
+ .
+ Not all of the upstream code is distributed in the source tarball.
+ See the README.Debian and copyright files for details.
+
+Package: mencoder
+Architecture: any
+Section: video
+Suggests: mplayer-doc,
+	  ttf-freefont,
+	  bzip2,
+	  fontconfig
+Depends: debconf | debconf-2.0,
+	 mplayer-nogui,
+	 ${shlibs:Depends},
+	 ${misc:Depends}
+Description: MPlayer's Movie Encoder
+ MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
+ ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
+ supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
+ also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
+ .
+ This package contains menconder, a simple movie encoder, designed to
+ encode MPlayer-playable movies
+ (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other
+ MPlayer-playable formats. It can encode with various codecs, like DivX4
+ (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream
+ copying and video resizing abilities.
+
+Package: mplayer-nogui
+Architecture: any
+Section: video
+Suggests: mplayer-doc,
+          ttf-freefont,
+          netselect | fping,
+          bzip2,
+          fontconfig,
+          nvidia-libvdpau1 | nvidia-libvdpau
+Depends: debconf | debconf-2.0,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Replaces: mplayer (<< 2:1.0~rc3+svn20090426-1),
+          mplayer-doc (<< 1.0~rc3+svn20090426-1)
+Description: movie player for Unix-like systems
+ MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
+ ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
+ supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
+ also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
+ .
+ Another big feature of MPlayer is the wide range of supported output
+ drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
+ DirectFB, but also SDL (plus all its drivers) and some
+ low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
+ and Permedia3). Most of them support software or hardware scaling,
+ therefore allowing fullscreen display.  MPlayer is also able
+ to use some hardware MPEG decoder boards, such as the DVB
+ and DXR3/Hollywood+.
+ .
+ Not all of the upstream code is distributed in the source tarball.
+ See the README.Debian and copyright files for details.
+ .
+ Version without the GUI in GTK
+
+Package: mplayer-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: mplayer, ${misc:Depends}
+Recommends: ffmpeg-dbg
+Description: debugging symbols for MPlayer
+ This package contains the debugging symbols for MPlayer, a movie
+ player for Unix-like systems. You only need these if you want to
+ generate debugging backtraces.
+
+Package: mplayer-doc
+Architecture: all
+Section: doc
+Recommends: mplayer
+Depends: ${misc:Depends}
+Replaces: mplayer (<< 2:1.0~rc3+svn20090426-1)
+Description: documentation for MPlayer
+ This package contains the documentation for MPlayer, a movie player for
+ Unix-like systems.
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-nogui.preinst
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-nogui.preinst
@@ -0,0 +1,43 @@
+#!/bin/sh
+# preinst script
+#
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    install)
+    ;;
+    upgrade)
+    if dpkg --compare-versions "$2" le "1.0~rc3+svn20090405-1"; then
+        md5=`md5sum /etc/mplayer/mplayer.conf | cut -d' ' -f1`
+	case "$md5" in
+	    46f52a60c07ed788500056dd7ffd27b9)
+		echo "removing obsolete /etc/mplayer/mplayer.conf"
+		rm -f /etc/mplayer/mplayer.conf
+	esac
+    fi
+
+    ;;
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- mplayer-1.0~rc3+svn20090426.orig/debian/get-orig-source.sh
+++ mplayer-1.0~rc3+svn20090426/debian/get-orig-source.sh
@@ -0,0 +1,121 @@
+#!/bin/sh
+#
+#  Script to create a 'pristine' tarball for the debian mplayer source package
+#  Copyright (C) 2009, Reinhard Tartler
+#
+#  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.
+
+set -eu
+
+usage() {
+	cat >&2 <<EOF
+usage: $0 [-dh]
+  -h : display help
+  -d : svn date
+EOF
+}
+
+debug () {
+	$DEBUG && echo "DEBUG: $*" >&2
+}
+
+error () {
+	echo "$1" >&2
+	exit 1;
+}
+
+set +e
+PARAMS=`getopt hd: "$@"`
+if test $? -ne 0; then usage; exit 1; fi;
+set -e
+
+eval set -- "$PARAMS"
+
+DEBUG=false
+SVNDATE=
+
+while test $# -gt 0
+do
+	case $1 in
+		-h) usage; exit 1 ;;
+		-d) SVNDATE=$2; shift ;;
+		--) shift ; break ;;
+		*)  echo "Internal error!" ; exit 1 ;;
+	esac
+	shift
+done
+
+# sanity checks now
+dh_testdir
+
+if [ -z $SVNDATE ]; then
+	error "you need to specify an svn date. e.g. 20081230 for Dec 29. 2008"
+fi
+
+CLEANUPSCRIPT=`pwd`/debian/strip.sh
+TARBALL=`pwd`/../mplayer_1.0~rc3+svn${SVNDATE}.orig.tar.gz
+TARBALL_UNSTRIPPED=`pwd`/../mplayer-non-dfsg_1.0~rc3+svn${SVNDATE}.orig.tar.gz
+PACKAGENAME=mplayer
+
+TMPDIR=`mktemp -d`
+trap 'rm -rf ${TMPDIR}'  EXIT
+
+baseurl="svn://svn.mplayerhq.hu/mplayer/branches/1.0rc3"
+
+svn export -r{${SVNDATE}} \
+	--ignore-externals \
+	${baseurl}  \
+	${TMPDIR}/${PACKAGENAME}
+
+svn info -r{${SVNDATE}} \
+	${baseurl} \
+	| awk '/^Revision/ {print $2}' \
+	> ${TMPDIR}/${PACKAGENAME}/.svnrevision
+
+# get svn externals
+svn pg svn:externals $baseurl | grep -v libswscale | \
+while read external url; do
+    [ -z $url ] && continue
+    dest="${TMPDIR}/${PACKAGENAME}/${external}"
+    svn export -r{${SVNDATE}} --ignore-externals $url $dest
+    svn info $url -r{${SVNDATE}} \
+      | awk '/^Revision/ {print $2}' > ${dest}/.svnrevision
+done
+
+# for mplayer release branches, libswscale is special since it contains
+# svn revision options. The revision below needs manual syncing with
+# upstream's svn.
+
+# TODO: find some way to integrate this in the while loop above
+
+dest="${TMPDIR}/${PACKAGENAME}/libswscale"
+revision=28777
+svn export -r $revision svn://svn.ffmpeg.org/mplayer/trunk/libswscale $dest
+echo $revision > ${dest}/.svnrevision
+
+# this doesn't belong in strip.sh, because the unstripped source should
+# have this directory renamed as well.
+( cd ${TMPDIR}/${PACKAGENAME} && rm -rfv debian )
+
+( cd ${TMPDIR}/ && mv ${PACKAGENAME} ${PACKAGENAME}-${SVNDATE} )
+
+tar czf ${TARBALL_UNSTRIPPED} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
+	
+( cd ${TMPDIR}/${PACKAGENAME}-${SVNDATE} && sh ${CLEANUPSCRIPT} )
+
+tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
+
+# print diff
+( cd ${TMPDIR} && ptardiff ${TARBALL_UNSTRIPPED} ) | tee ${TARBALL}.diff
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.doc-base.hu
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.doc-base.hu
@@ -0,0 +1,11 @@
+Document: mplayer-hu
+Title: MPlayer documentation (Hungarian)
+Author: The MPlayer team
+Abstract: This documentation describes the use of MPlayer. (Hungarian)
+ MPlayer is a movie player for GNU/Linux that supports a wide
+ range of audio and video formats, and output drivers.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/mplayer-doc/HTML/hu/index.html
+Files: /usr/share/doc/mplayer-doc/HTML/hu/*.html
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-nogui.mime
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-nogui.mime
@@ -0,0 +1,21 @@
+application/x-ogg; /usr/bin/mplayer %s; description="OggVorbis Audio"
+application/ogg; /usr/bin/mplayer %s; description="OggVorbis Audio"
+audio/mpeg; /usr/bin/mplayer %s; description="MPEG Audio Format"
+audio/x-mpegurl; /usr/bin/mplayer %s; description="Icecast Playlists"
+audio/x-ms-wax; /usr/bin/mplayer %s; description="Audio Format"
+audio/x-ms-wma; /usr/bin/mplayer %s; description="Audio Format"
+audio/x-pls; /usr/bin/mplayer %s; description="MP3 ShoutCast/IceCast Playlist"
+audio/x-scpls; /usr/bin/mplayer %s; description="Shoutcast Playlists"
+audio/x-wav; /usr/bin/mplayer %s; description="Waveform Microsoft Wave/RIFF"
+video/mpeg; /usr/bin/mplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY"
+video/quicktime; /usr/bin/mplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY"
+video/x-mpeg2; /usr/bin/mplayer %s; description="MPEG Video"; test=test -n "$DISPLAY"
+video/x-mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY"
+video/mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY"
+video/x-ms-afs; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-asf; /usr/bin/mplayer %s; description="MS ASF video"; test=test -n "$DISPLAY"
+video/x-msvideo; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wma; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wmv; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wmx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wvx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
--- mplayer-1.0~rc3+svn20090426.orig/debian/gbp.conf
+++ mplayer-1.0~rc3+svn20090426/debian/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = karmic
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+pristine-tar = True
--- mplayer-1.0~rc3+svn20090426.orig/debian/README.Debian.all
+++ mplayer-1.0~rc3+svn20090426/debian/README.Debian.all
@@ -0,0 +1,124 @@
+
+
+MPlayer configuration
+=====================
+
+The performance of MPlayer depends heavily on hardware. This means that
+it may benefit from tweaking options for every single machine it is
+installed on. Please refer to the documentation provided by the 'mplayer-doc'
+package.
+
+Some configuration options for the entire system will be set in the file
+/etc/mplayer/mplayer.conf which may be adapted later. Each user can also
+define private options in ~/.mplayer/config.
+
+
+Unofficial packages
+===================
+
+There are unofficial mplayer packages, courtesy of Christian Marillat,
+available at the following address:
+
+  http://www.debian-multimedia.org/
+
+As there are even packages providing the 'mencoder' application as well as
+many other multimedia-related software in this repository, you may want to add
+it to your /etc/apt/sources.list file following the instructions given on the
+Debian Multimedia homepage.
+
+WARNING: Some packages are both in the official Debian and in the unofficial
+         Debian Multimedia repository.
+
+If a package has a newer version in the unofficial repository than in Debian,
+this spackage will automatically be replaced with the unofficial version. This
+may also be the case for the mplayer package!
+
+In order to prevent this situation, you may want to apply a method called
+"apt-pinning" and add the following lines to your /etc/apt/preferences file:
+
+  Package: *
+  Pin: release o=Unofficial Multimedia Packages
+  Pin-Priority: 450
+
+This will give preference to the official Debian package. Otherwise, if you
+want to give preference to the Debian Multimedia packages, choose
+'Pin-Priority: 550'.
+
+To find out if apt-pinning works for you try the following command:
+
+  apt-cache policy mplayer
+  mplayer:
+    Installed : ....
+    Candidate : 1.0~rc1-8
+    Table de version :
+     [version]  [??]
+        450 http://www.debian-multimedia.org etch main
+ *** [version]  [??]
+        500 http://ftp.de.debian.org ustable/main Packages
+        100 /var/lib/dpkg/status
+
+The line beginning with "Candidate" and the one containing the three asterisks
+"*" indicate the preferred package version. (However, due to bug #254820 the
+output of this command may be even wrong).
+
+Unfortunately, (due to bug #317186) the following apt-pinning does not
+currently work:
+
+  Package: mplayer
+  Pin: release o=Unofficial Multimedia Packages
+  Pin-Priority: 450
+
+a.
+
+
+MPlayer Performance
+===================
+
+Most options are autodetected or configured during compilation; thus
+users get a better performance if they rebuild this package themselves.
+
+In case you would like to change the parameters passed to ./configure,
+set variable DEB_BUILD_CONFIGURE. When this binary was compiled, the
+variable was set to
+
+DEB_BUILD_CONFIGURE=@DEB_BUILD_CONFIGURE@
+
+The recommended method to rebuild the packages is running
+
+  fakeroot debian/rules DEB_BUILD_CONFIGURE="" binary
+
+in the top directory of source code. This will reset the hard-coded configure
+flags used for the official Debian package and will optimize the mplayer build
+strictly for your CPU.
+
+Dariush Pietrzak <eyck@ghost.anime.pl> Sat Jan 5 20:28:23 CET 2002
+
+Shared linking
+==============
+
+A factor affecting performance may be also that MPlayer in Debian
+is shared-linked to FFMpeg. To avoid it, delete the line
+30link-system-ffmpeg.patch from debian/patches/series
+
+a.
+
+Debugging
+=========
+
+Currently MPlayer in Debian is compiled with
+ ./configure --enable-debug
+
+Debugging symbols are stored into the package 'mplayer-dbg' and
+are automatically available to 'gdb' once that package is installed.
+
+a.
+
+
+Compliance with the MPlayer binary packaging guide
+==================================================
+
+This binary roughly conforms to
+ http://www.mplayerhq.hu/DOCS/tech/binary-packaging.txt
+but it may better.
+
+ -- A Mennucc <mennucc1@debian.org>, Sun, 22 Mar 2009 16:04:44 +0100
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.doc-base.cs
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.doc-base.cs
@@ -0,0 +1,11 @@
+Document: mplayer-cs
+Title: MPlayer documentation (Czech)
+Author: The MPlayer team
+Abstract: This documentation describes the use of MPlayer. (Czech)
+ MPlayer is a movie player for GNU/Linux that supports a wide
+ range of audio and video formats, and output drivers.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/mplayer-doc/HTML/cs/index.html
+Files: /usr/share/doc/mplayer-doc/HTML/cs/*.html
--- mplayer-1.0~rc3+svn20090426.orig/debian/strip.sh
+++ mplayer-1.0~rc3+svn20090426/debian/strip.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# This contains the dreaded DVD decryption code. We can live without it
+#  by using libdvdread3 (and the optional library installed by
+#    http://www.debian-unofficial.org/   :-)
+rm -rfv libdvdcss
+
+# strip/clean the code from potentially dangerous patented code
+# KEEP THIS IN SYNC WITH THE ffmpeg-debian PACKAGE!
+for codec in 'h263.*' 'h264.*' mpeg2video mpeg4 'msmpeg4.*'; do
+    F=libavcodec/allcodecs.c
+    sed -i "/REGISTER_ENCODER.*\\<$codec\\>/d" $F
+    sed -i "s/REGISTER_ENCDEC\\(.*\\<$codec\\>\\)/REGISTER_DECODER\\1/" $F
+    F=libavcodec/*.c
+    sed -i "/AVCodec *${codec}_encoder *=/,/^[[:space:]]*}/d" $F
+done
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.doc-base.de
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.doc-base.de
@@ -0,0 +1,11 @@
+Document: mplayer-de
+Title: MPlayer documentation (German)
+Author: The MPlayer team
+Abstract: This documentation describes the use of MPlayer. (German)
+ MPlayer is a movie player for GNU/Linux that supports a wide
+ range of audio and video formats, and output drivers.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/mplayer-doc/HTML/de/index.html
+Files: /usr/share/doc/mplayer-doc/HTML/de/*.html
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-nogui.examples
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-nogui.examples
@@ -0,0 +1,3 @@
+etc/example.conf
+etc/menu.conf
+etc/input.conf
--- mplayer-1.0~rc3+svn20090426.orig/debian/compat
+++ mplayer-1.0~rc3+svn20090426/debian/compat
@@ -0,0 +1 @@
+7
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-nogui.install
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-nogui.install
@@ -0,0 +1,4 @@
+TOOLS/binary_codecs.sh usr/share/mplayer/
+TOOLS/midentify.sh usr/share/mplayer/
+debian/prefs var/lib/mplayer/
+etc/input.conf etc/menu.conf etc/mplayer
--- mplayer-1.0~rc3+svn20090426.orig/debian/README.source
+++ mplayer-1.0~rc3+svn20090426/debian/README.source
@@ -0,0 +1,9 @@
+This package uses quilt to manage all modifications to the upstream source.
+The fully patched source can be generated using the patch target provided by
+`debian/rules'.
+
+If you want to know more about how to use quilt to manage Debian patches, read
+/usr/share/doc/quilt/README.source.
+
+Moreover, the debian/control file is generated from debian/control.in using
+the debian/control target provided by `debian/rules'.
--- mplayer-1.0~rc3+svn20090426.orig/debian/apport-hook.py
+++ mplayer-1.0~rc3+svn20090426/debian/apport-hook.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+'''apport package hook for mplayer
+
+(c) 2009 Author: Reinhard Tartler <siretart@tauware.de>
+'''
+
+from apport.hookutils import *
+from os import path
+
+def add_info(report):
+    # Build System Environment
+    report['system'] = "distro = Ubuntu, architecture = %s, kernel = %s" % (command_output(['uname','-m']), command_output(['uname','-r']))
+
+    attach_related_packages(report, [
+            "libavcodec52",
+            "libavcodec-extra-52",
+            ])
+            
+    attach_file_if_exists(report, path.expanduser('~/.mplayer/config'), 'UserConf')
+    attach_file(report, '/etc/mplayer/mplayer.conf', 'SystemConf')
+
+## DEBUGING ##
+if __name__ == '__main__':
+    report = {}
+    add_info(report)
+    for key in report:
+        print '[%s]\n%s' % (key, report[key])
--- mplayer-1.0~rc3+svn20090426.orig/debian/README.Debian.free
+++ mplayer-1.0~rc3+svn20090426/debian/README.Debian.free
@@ -0,0 +1,64 @@
+The following part of the document is conditionally added for packages that
+are built from stripped sources.
+
+Stripping of the source code
+============================
+
+WARNING: The mplayer sources as published in the Debian 'main' component have
+         some parts "stripped", i.e. disabled or removed!
+
+* In order to update the package yourself and/or to review the changes done
+  to the source code, please see the files:
+
+   debian/README.upstream-upgrade
+   debian/get-orig-source.sh
+   debian/strip.sh
+
+* In particular, the internal mpdvdkit library was deleted, so the mplayer
+  package provided by Debian is unable to play encrypted DVDs. If you want to
+  play encrypted DVDs (i.e. almost all available Video-DVDs), please follow
+  the instructions in /usr/share/doc/libdvdread3/README.Debian on how to
+  obtain the necessary libdvdcss2 package.
+
+* Please refrain from bothering MPlayer's upstream authors with bug reports
+  and/or feature requests, but use the Debian bug tracking system instead.
+  Missing features and/or bugs may be results of Debian's stripping of the
+  source code.
+
+A. Mennucc with adaptions by Reinhard Tartler and Fabian Greffrath
+
+
+Compliance with the GPLv2, sec 2.a
+==================================
+
+The MPlayer sources contain source code from other GPL libraries, such as
+libavcodec from the FFMpeg project, mp3lib, liba52 and others. Please see the
+file debian/copyright for detailed licensing information.
+
+During the discussions on debian-legal in 2002-03, it was pointed out
+that MPlayer may not be respecting the following section of the GPL v2:
+
+  2. You may modify your copy or copies of the Program or any portion of
+  it, thus forming a work based on the Program, and copy and distribute
+  such modifications or work under the terms of Section 1 above, provided
+  that you also meet all of these conditions:
+
+  a) You must cause the modified files to carry prominent notices stating
+  that you changed the files and the date of any change.
+
+This issue is pointed out in detail in the following thread:
+  http://lists.debian.org/debian-legal/2003/debian-legal-200301/msg00231.html
+
+Currently mplayer ships files such as
+  liba52/liba52_changes.diff
+  libfaad2/local_changes.diff
+  libmpdvdkit2/libdvdcss_changes.diff
+  libmpdvdkit2/libdvdread_changes.diff
+  libmpeg2/libmpeg-0.4.0.diff
+  tremor/tremor.diff
+to comply with this request.
+
+Moreover all changes to the code are documented in the publicly accessible SVN
+repository of MPlayer.
+
+A. Mennucc with adaptions by Fabian Greffrath
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer.conf
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer.conf
@@ -0,0 +1,130 @@
+#
+# MPlayer configuration file
+#
+# Configuration files are read system-wide from /etc/mplayer/mplayer.conf
+# and per user from ~/.mplayer/config, where per-user settings override
+# system-wide settings, all of which are overrriden by the command line.
+#
+# The configuration file settings are the same as the command line
+# options without the preceding '-'.
+#
+# See the CONFIGURATION FILES section in the man page
+# for a detailed description of the syntax.
+
+
+##################
+# video settings #
+##################
+
+# Specify default video driver (see -vo help for a list).
+# vo=xv,x11
+
+# FBdev driver:
+#
+# mode to use (read from fb.modes)
+#fbmode = 640x480-120
+#
+# location of the fb.modes file
+#fbmodeconfig = /etc/fb.modes
+
+# Specify your monitor timings for the vesa and fbdev video output drivers.
+# See /etc/X11/XF86Config for timings. Be careful; if you specify settings
+# that exceed the capabilities of your monitor, you may damage it.
+#
+# horizontal frequency range (k stands for 1000)
+#monitor-hfreq = 31.5k-50k,70k
+#
+# vertical frequency range
+#monitor-vfreq = 50-90
+#
+# dotclock (or pixelclock) range (m stands for 1000000)
+#monitor-dotclock = 30M-300M
+
+# Start in fullscreen mode by default.
+#fs=yes
+
+# Change to a different videomode when going fullscreen.
+#vm=yes
+
+# Override the autodetected color depth, may need 'vm=yes' as well.
+#bpp=0
+
+# Enable software scaling (powerful CPU needed) for video output
+# drivers that do not support hardware scaling.
+#zoom=yes
+
+# standard monitor size, with square pixels
+#monitoraspect=4:3
+
+# Use this for a widescreen monitor, non-square pixels.
+#monitoraspect=16:9
+
+# Keep the player window on top of all other windows.
+#ontop=yes
+
+
+##################
+# audio settings #
+##################
+
+# Use pulse, then alsa, then SDL video with the aalib subdriver by default.
+ao=pulse,alsa,sdl:aalib
+
+# Use SDL audio driver with the esd subdriver by default.
+#ao = sdl:esd
+
+# Specify the mixer device.
+#mixer = /dev/mixer
+
+# Resample the sound to 44100Hz with the lavcresample audio filter.
+#af=lavcresample=44100
+
+
+##################
+# other settings #
+##################
+
+stop-xscreensaver=yes
+
+# Pretend to be Window Media Player.
+# Fixes playback when playlist and media file use the same URL.
+#user-agent=NSPlayer/4.1.0.3856
+
+# Drop frames to preserve audio/video sync.
+#framedrop = yes
+
+# Specify your preferred skin here (skins are searched for in
+# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
+#skin = Abyss
+
+# Resample the font alphamap.
+# 0     plain white fonts
+# 0.75  very narrow black outline (default)
+# 1     narrow black outline
+# 10    bold black outline
+#ffactor = 0.75
+
+# cache settings
+#
+# Use 8MB input cache by default.
+#cache = 8192
+#
+# Prefill 20% of the cache before starting playback.
+#cache-min = 20.0
+#
+# Prefill 50% of the cache before restarting playback after the cache emptied.
+#cache-seek-min = 50
+
+# DVD: Display English subtitles if available.
+#slang = en
+
+# DVD: Play English audio tracks if available.
+#alang = en
+
+###################
+# DVDNAV Settings #
+###################
+#vc=ffmpeg12,
+
+# You can also include other configuration files.
+#include = /path/to/the/file/you/want/to/include
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.doc-base.pl
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.doc-base.pl
@@ -0,0 +1,11 @@
+Document: mplayer-pl
+Title: MPlayer documentation (Polish)
+Author: The MPlayer team
+Abstract: This documentation describes the use of MPlayer. (Polish)
+ MPlayer is a movie player for GNU/Linux that supports a wide
+ range of audio and video formats, and output drivers.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/mplayer-doc/HTML/pl/index.html
+Files: /usr/share/doc/mplayer-doc/HTML/pl/*.html
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer.menu
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer.menu
@@ -0,0 +1 @@
+?package(mplayer):command="/usr/bin/gmplayer" section="Applications/Video" needs="X11" title="gmplayer"
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-dbg.links
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-dbg.links
@@ -0,0 +1 @@
+/usr/lib/debug/usr/bin/mplayer /usr/lib/debug/usr/bin/gmplayer
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.doc-base.es
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.doc-base.es
@@ -0,0 +1,11 @@
+Document: mplayer-es
+Title: MPlayer documentation (Spanish)
+Author: The MPlayer team
+Abstract: This documentation describes the use of MPlayer. (Spanish)
+ MPlayer is a movie player for GNU/Linux that supports a wide
+ range of audio and video formats, and output drivers.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/mplayer-doc/HTML/es/index.html
+Files: /usr/share/doc/mplayer-doc/HTML/es/*.html
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer.mime
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer.mime
@@ -0,0 +1,21 @@
+application/x-ogg; /usr/bin/gmplayer %s; description="OggVorbis Audio"
+application/ogg; /usr/bin/gmplayer %s; description="OggVorbis Audio"
+audio/mpeg; /usr/bin/gmplayer %s; description="MPEG Audio Format"
+audio/x-mpegurl; /usr/bin/gmplayer %s; description="Icecast Playlists"
+audio/x-ms-wax; /usr/bin/gmplayer %s; description="Audio Format"
+audio/x-ms-wma; /usr/bin/gmplayer %s; description="Audio Format"
+audio/x-pls; /usr/bin/gmplayer %s; description="MP3 ShoutCast/IceCast Playlist"
+audio/x-scpls; /usr/bin/gmplayer %s; description="Shoutcast Playlists"
+audio/x-wav; /usr/bin/gmplayer %s; description="Waveform Microsoft Wave/RIFF"
+video/mpeg; /usr/bin/gmplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY"
+video/quicktime; /usr/bin/gmplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY"
+video/x-mpeg2; /usr/bin/gmplayer %s; description="MPEG Video"; test=test -n "$DISPLAY"
+video/x-mpeg; /usr/bin/gmplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY"
+video/mpeg; /usr/bin/gmplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY"
+video/x-ms-afs; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-asf; /usr/bin/gmplayer %s; description="MS ASF video"; test=test -n "$DISPLAY"
+video/x-msvideo; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wma; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wmv; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wmx; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wvx; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.doc-base.fr
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.doc-base.fr
@@ -0,0 +1,11 @@
+Document: mplayer-fr
+Title: MPlayer documentation (French)
+Author: The MPlayer team
+Abstract: This documentation describes the use of MPlayer. (French)
+ MPlayer is a movie player for GNU/Linux that supports a wide
+ range of audio and video formats, and output drivers.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/mplayer-doc/HTML/fr/index.html
+Files: /usr/share/doc/mplayer-doc/HTML/fr/*.html
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.doc-base.ru
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.doc-base.ru
@@ -0,0 +1,11 @@
+Document: mplayer-ru
+Title: MPlayer documentation (Russian)
+Author: The MPlayer team
+Abstract: This documentation describes the use of MPlayer. (Russian)
+ MPlayer is a movie player for GNU/Linux that supports a wide
+ range of audio and video formats, and output drivers.
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/mplayer-doc/HTML/ru/index.html
+Files: /usr/share/doc/mplayer-doc/HTML/ru/*.html
--- mplayer-1.0~rc3+svn20090426.orig/debian/mplayer-doc.docs
+++ mplayer-1.0~rc3+svn20090426/debian/mplayer-doc.docs
@@ -0,0 +1,3 @@
+Copyright
+DOCS/HTML
+DOCS/tech
--- mplayer-1.0~rc3+svn20090426.orig/debian/README.Debian.nonfree
+++ mplayer-1.0~rc3+svn20090426/debian/README.Debian.nonfree
@@ -0,0 +1,11 @@
+The following part of the document is conditionally added for packages that
+are built from pristine upstream sources.
+
+Pristine source code
+====================
+
+This version of the mplayer binary and source package contains the pristine
+source code as published by the MPlayer development team.
+
+Since Debian has concern with distributing various bits of the code, it
+cannot currently be included in the Debian 'main' component.
--- mplayer-1.0~rc3+svn20090426.orig/debian/changelog
+++ mplayer-1.0~rc3+svn20090426/debian/changelog
@@ -0,0 +1,1102 @@
+mplayer (2:1.0~rc3+svn20090426-1ubuntu11) lucid; urgency=low
+
+  * Add 50_fix_initial_volume_setting_pulse_output.patch to resolve the
+    stream volume being set to max upon each mplayer invocation
+    (LP: #482408)
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Wed, 18 Nov 2009 19:42:09 -0500
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu10) karmic; urgency=low
+
+  * make sure that patches are applied for non-i386 builds as well.
+    Fixes: LP: #390398, #448603, #448595, #441566, #440346
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 15 Oct 2009 17:55:21 +0200
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu9) karmic; urgency=low
+  
+  [ Julien Lavergne ]
+  * Renable xvid support by removing --disable-xvid in debian/rules.
+
+  [ Reinhard Tartler ]
+  * Also enable mp3lame support (at least for now) LP: #386449
+  * don't override the mplayer built-in defaults for the vo module LP: #446040
+  * verified that mennuc's screensaver patch is enabled and works in the default
+    configuration. LP: #439787
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 08 Oct 2009 09:23:29 +0200
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu8) karmic; urgency=low
+
+  * build depend on nvidia-185-libvdpau-dev only on i386 and amd64
+  * add ubuntu specific configuration file. LP: #276957, #440343
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 03 Oct 2009 10:45:23 +0200
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu7) karmic; urgency=low
+
+  * remove 41_use_fontconfig_by_default.patch, doesn't apply
+  * enable VDPAU on i386 and amd64 (LP: #437039)
+
+ -- Reinhard Tartler <siretart@tauware.de>  Mon, 28 Sep 2009 19:32:29 +0000
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu6) karmic; urgency=low
+
+  [ Andres Mejia ]
+  * Enable VDPAU support by including vdpau headers in deb packaging.
+
+  [ Reinhard Tartler ]
+  * sort build dependencies alphabetically
+  * avoid using tabs - prefer space instead
+  * reenable 22disable-xscreensaver.patch. The patch does work, but you
+    need to have the mouse cursor INSIDE the window
+  * don't build-depend on libmad, the internal mp3lib library is superiour
+    for most cases these days, according to upstream. LP: #111025, #163382
+  * add clarifications to the libgsm license.
+  * install the TOOLS/midentify.sh script LP: #333828
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 24 Sep 2009 21:09:24 +0200
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu5) karmic; urgency=low
+
+  * No-change rebuild to pick up new ffmpeg shlibs file.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Fri, 28 Aug 2009 21:04:38 +0200
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu4) karmic; urgency=low
+
+  * remove 22disable-xscreensaver.patch. Patch is not working properly 
+    anyways and actually potentially dangerous because it is faking input
+    activity.
+  * enable fontconfig by default.
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 18 Jun 2009 16:09:33 +0200
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu3) karmic; urgency=low
+
+  [ Reinhard Tartler ]
+  * add additional build dependencies that are available in
+    ubuntu/multiverse LP: #386449
+  * prefer auto-detection and lavc variants of many codecs in debian/rules
+  * install .desktop and .xpm file in the mplayer package
+
+  [ Siegfried Gevatter ]
+  * improve desktop file to conform (more) to the freedesktop file
+    specification LP: #386505
+
+ -- Reinhard Tartler <siretart@tauware.de>  Mon, 15 Jun 2009 23:24:25 +0200
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu2) karmic; urgency=low
+
+  * Bump epoch in debian/control as well, so that the Replaces field has
+    any effect in ubuntu
+
+ -- Reinhard Tartler <siretart@tauware.de>  Mon, 08 Jun 2009 07:51:12 +0200
+
+mplayer (2:1.0~rc3+svn20090426-1ubuntu1) karmic; urgency=low
+
+  * Switch to debian packaging for the mplayer package
+  * New upstream release, LP: #336697, #260918, #246675, #243453, #74282
+  * Fixes security issues: CVE-2008-5616, LP: #308939
+  * many flv fixes LP: #73271, #347021
+  * Build and install mencoder
+  * Bump epoch
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 06 Jun 2009 23:01:52 +0200
+
+mplayer (1.0~rc3+svn20090426-1) unstable; urgency=low
+
+  [ fabrice ]
+  * Introduce the mplayer-nogui package, that does not depend on GTK+
+
+  [ Reinhard Tartler ]
+  * new upstream svn version based on the 1.0rc3 branch
+  * various cleanups and refactoring in debian/rules
+  * no longer remove mencoder.c: It does hardly contain any "dangerous"
+    or patented code. Instead:
+  * strip libavcodec similar to how its done in the ffmpeg package. This
+    brings the patent policy of the mplayer and ffmpeg package in debian
+    finally in sync. c.f. the comments and the "discussion" in #522373.
+  * install upstream's version of binary_codecs.sh
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 04 Jun 2009 10:35:52 +0200
+
+mplayer (1.0~rc3+svn20090405-1) unstable; urgency=low
+
+  * New upstream version. Track the 1.0rc3 release branch for now.
+  * remove 50_r28803_segfault_print_int.patch, merged upstream.
+  * no longer remove the TOOLS subdirectory from the upstream source.
+  * make get-orig-source rule actually work.
+  * disable musepack support. Closes: #476384
+  * completely delegate handling of /etc/mplayer/mplayer.conf to
+    dpkg. This change removes also all debconf templates and reduces
+    package complexity.
+  * move .gbp.conf to debian/gbp.conf
+  * cleanups in debian/rules: prefer external debhelper helper files
+  * enhance upstream Makefile to install gmplayer manpages
+     - implement as quilt patch, submitted upstream
+     - debian/rules: make use of the added rules
+  * use dh_prep instead of dh_clean -k
+  * bump Standards-Version to 3.8.1 
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sun, 05 Apr 2009 11:37:37 +0200
+
+mplayer (1.0~rc2+svn20090303-7) unstable; urgency=low
+
+  * various cleanups in  debian/rules.
+  * as a side effect, DEB_BUILD_OPTIONS set to noopt no longer works. It
+    really needs to be implemented in ./configure instead of weird hackery
+    in debian/rules. patches welcome.
+  * run 'make distclean' only of config.mak exists.
+  * remove debian/control.mplayer* variants.
+  * don't --enable-debug on mipsen. This hopfully fixes the FTBFS on mipsen.
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 02 Apr 2009 18:48:07 +0200
+
+mplayer (1.0~rc2+svn20090303-6) unstable; urgency=low
+
+  [ A Mennucc1 ]
+
+  * use ./configure flags to dynamically link FFmpeg,
+    delete patch  30link-system-ffmpeg.patch
+
+  [ Reinhard Tartler ]
+
+  * cleanup debian/rules: use --enable-debug on all architectures but mips.
+    in order to fix a FTBFS. This results in making the -dbg package on mips
+    useless. If you are interested in having a usable mplayer-dbg package on
+    mips, please try enabling that switch in debian/rules and send us your
+    buildlog!
+  * run 'make distclean' only of config.mak exists
+  * cleanup debian/rules: remove unnecessary clean statements
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 28 Mar 2009 07:24:07 +0100
+
+mplayer (1.0~rc2+svn20090303-5) unstable; urgency=low
+
+  * debian/control : move docbook-xml,docbook-xsl,xsltproc from 
+    Build-Depends-Indep to Build-Depends, since they are needed to run
+    configure
+
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 23 Mar 2009 10:05:45 +0100
+
+mplayer (1.0~rc2+svn20090303-4) unstable; urgency=low
+
+  * try another fix for bug 520113
+  * disable specific patch for powerpc, that was reducing optimization to -O
+    to avoid gcc bug 475153
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 22 Mar 2009 10:11:36 +0100
+
+mplayer (1.0~rc2+svn20090303-3) unstable; urgency=low
+
+  * try a fix for bug 520113
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 20 Mar 2009 18:23:35 +0100
+  
+mplayer (1.0~rc2+svn20090303-2) unstable; urgency=low
+
+  * always build documentation. Fixes FTBFS.
+
+ -- Reinhard Tartler <siretart@tauware.de>  Fri, 13 Mar 2009 09:34:27 +0100
+
+mplayer (1.0~rc2+svn20090303-1) unstable; urgency=low
+
+  * new upstream snapshot (Closes: #517774)
+  * this version has dvdnav:// support (Closes: #430211)
+  * rebuild against new ffmpeg in unstable,
+    (Closes: #518670, #516933, #492229, #505048, #512892, #496709)
+  * converted package to use git Closes: #508483
+  * completly reworked the way the .orig.tar.gz is created, please see
+    debian/README.upstream-upgrade and debian/get-orig-source.sh for details
+  * large refactoring of debian/control and debian/rules
+  * dropped many unnecessary versioned build dependencies
+  * bumped debhelper compatibility level 4->7
+  * replace patch system from dpatch to quilt
+  * dropped the following patches, merged upstream:
+        - 10configure-alpha.dpatch
+        - 12configure-vidix-alpha.dpatch
+        - 24mplayer.desktop.dpatch
+        - 25kFreeBDS.dpatch
+        - 25mplayer-desktop.dpatch
+        - 30vorbis-block-alloc.dpatch
+        - 40rtsp_demux.dpatch
+        - 51xsai.dpatch
+        - CVE-2008-0073--rtsp_fix.diff
+        - CVE-2008-0629--stream_cddb.c.diff
+        - CVE-2008-0630.diff
+        - SA33136_demux_vqf.c.diff
+        - demux.patch
+        - demux_audio_fix_20080129.diff
+        - demux_mov_fix_20080129.diff
+        - oCERT-2008-013--realfix.diff
+        - theora_length_fix_svn27354.diff
+        - to-ffmpeg-free-0.svn20080206.diff
+  * reworked the way the control file for the mplayer-non-dfsg package is
+    handled: it now copied from debian/control.mplayer-non-dfsg. Add a
+    debian/control target in debian rules.
+  * do not run the actual rules of debian/rules in parallel, fixes FTBFS
+  * implement the debconf review by Josselin Mouette and Christian
+    Perrier. The last debconf question is mplayer/replace-existing-files
+    (which can be dropped after ucf is deployed in the package) and
+    mplayer/voutput, which needs more thought. (Closes: #445091)
+  * verified that http://oumph.free.fr/tmp/29761.h264 no longer crashes
+    mplayer (Closes: #497467)
+  * add japanese debconf translation, thanks to Hideki Yamane. 
+    (Closes: #512874)
+  * warn about libstdc++.so.5 when installing binary codecs in i386 as well
+    (Closes: #497787)
+  * add libpulse-dev to build dependencies to enable pulseaudio backend
+    (Closes: #468470)
+  * add libschroedinger-dev to build dependencies
+
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 11 Mar 2009 22:23:25 +0100
+
+mplayer (1.0~rc2-20) unstable; urgency=low
+
+  * use external libfaad : external libfaad is newer, and does not crash
+    on aac file in  http://bugs.debian.org/407010
+
+ -- A Mennucc1 <mennucc1@debian.org>  Thu, 18 Dec 2008 11:48:42 +0100
+
+mplayer (1.0~rc2-19) unstable; urgency=high
+
+  * SA33136: MPlayer TwinVQ Processing Buffer Overflow Vulnerability
+    Thanks to T. Klein, G. Iuculano, R. Döffinger  (Closes: #508803).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 15 Dec 2008 21:05:07 +0100
+
+mplayer (1.0~rc2-18) unstable; urgency=high
+
+  * fix oCERT-2008-013 Mplayer real demuxer heap.
+    Thanks to Felipe Andres Manzano, Andrea Barisani,
+     Steffen Joeris, Reimar Döffinger. (Closes: #500683).
+  * Clean lintian warnings:
+     build-depend on libgif-dev instead of libungif4-dev
+     build-depend on x11proto-core-dev instead of x-dev 
+     depends on  debconf | debconf-2.0
+  * Up standard to 3.8.0.0
+     support DEB_BUILD_OPTIONS="parallel=n"
+
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 22 Sep 2008 11:01:26 +0200
+
+mplayer (1.0~rc2-17) unstable; urgency=low
+
+  * fix bashism in binary_codecs.sh script,
+    thanks to Raphael Geissert (Closes: #489636).
+  * use proper name 'mplayer.xpm' for the icon,
+    thanks to Fernando Mitio Yamada (Closes: #483499).
+  * fix: show correct length of theora video (from svn27354),
+    thanks to Sam Morris and  Reimar Döffinger (Closes: #464207).
+  * [INTL:sv] Swedish strings for mplayer debconf, 
+    thanks to brother@bsnet.se (Closes: #491777).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 27 Jul 2008 09:26:24 +0200
+
+mplayer (1.0~rc2-16) unstable; urgency=high
+
+  * fix FTBFS, build-depends against libdvdread-dev,
+    thanks to Bastian Blank (Closes: #491366).
+  * update lists of binary codecs and mirrors
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 20 Jul 2008 12:05:47 +0200
+
+mplayer (1.0~rc2-15) unstable; urgency=low
+
+  * build-depend on  liblzo2-dev  
+  * Bug fix: "mplayer segfaults on opening any *.flv file", thanks A LOT to
+    Ondrej Certik (Closes: #489291).
+  * Bug fix: "mplayer: crashes on playing a standalone aac file", thanks
+    to Michal Suchanek (Closes: #489419).
+  * Bug fix: "mplayer: crashes with &quot;MPlayer interrupted by signal 11
+    in module: demux_open&quot; on FLV files", thanks to Paul Collins
+    (Closes: #487830).
+  * Bug fix: "mplayer: [INTL:it] debconf templates italian translation",
+    thanks to Alessandro Vietta (Closes: #481418).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 06 Jul 2008 17:57:29 +0200
+
+mplayer (1.0~rc2-14) unstable; urgency=low
+
+  * Links with ffmpeg-free provided libraries  (Closes: #395252).
+  * Uses libsvga1-dev  in Build-Depends instead of svgalibg1-dev,
+    thanks to Guillem Jover (Closes: #483460).
+  * Build-depend on vstream-client-dev,
+    thanks to Paul Hedderly (Closes: #487291).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 23 Jun 2008 13:20:34 +0200
+
+mplayer (1.0~rc2-12) unstable; urgency=low
+
+  * Conflicts on gcc-4.3 <= 4.3.0-3 to avoid bug 475153 .
+  * Sorry, 'DEB_BUILD_OPTIONS=noopt ./debian/rules  build-arch'
+    is again broken in i386 . It is simply too difficult to build
+    mplayer on i386 w/o optimizing it a bit. For details, see 
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44
+    and following.
+  * For this reason, and to help solving the strange bug 478731
+    I have decided to build mplayer with  'configure --enable-debug' and
+    to create a 'mplayer-dbg' package, to ship debugging symbols.
+
+ -- A Mennucc1 <mennucc1@debian.org>  Thu, 01 May 2008 20:40:42 +0200
+
+mplayer (1.0~rc2-11) unstable; urgency=low
+
+  * avoid FTBFS bug introduced by dpkg-buildpackage setting of "CFLAGS
+    & al" in environment,
+    thanks to Lucas Nussbaum (Closes: #475973).
+  * set 'autodetect' to 'xv,x11' to avoid problems with xvmc and/or gmplayer,
+    thanks to Walter B. Rasmann (Closes: #473686).
+    thanks to Sam Morris (Closes: #475934).
+    thanks to Victor Hahn (Closes: #458786).
+  * fix bashism in /bin/sh maintainer script,
+    thanks to Raphael Geissert (Closes: #472232).
+  * renamed mplayer.xpm to mplayer in desktop file,
+    thanks to giggz (Closes: #472833).
+  * added debian/README.source
+  * add libmpcdec to build-dependencies
+
+ -- A Mennucc1 <mennucc1@debian.org>  Thu, 01 May 2008 12:16:08 +0200
+
+mplayer (1.0~rc2-10) unstable; urgency=high
+
+  * fix: CVE-2008-0073 remote code execution via crafted rtsp stream,
+    thanks to Nico Golde and  Reimar Döffinger (Closes: #473056).
+  * use ALSA by default, thanks to Sam Morris (Closes: #470617).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sat, 29 Mar 2008 09:40:09 +0100
+
+mplayer (1.0~rc2-9) unstable; urgency=low
+
+  * fix: gmplayer wrong driver setting "vo_driver= xmga", thanks to
+    Siegfrid Brandstätter (Closes: #449041).
+  * added dependency libaudio-dev, libfribidi-dev, libopenal-dev;
+    this should make mplayer compiling less dependent on build environment
+  * and moreover I think I enabled almost everything around, thanks to
+    Fabian Greffrath (Closes: #419790).
+  * add BiDi support, thanks to Khaled Hosny (Closes: #462611).
+  * removed 'uploaders: Dariush Pietrzak <eyck@kuszelas.com>'
+    thanks to Lucas Nussbaum (Closes: #460031).
+  * fix missing newline from message displayed by postinst script,
+    thanks to Serafeim Zanikolas (Closes: #468059).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 21 Mar 2008 16:14:55 +0100
+
+mplayer (1.0~rc2-8) unstable; urgency=low
+
+  * fix SVN25823 for
+    CVE-2008-0630, buffer overflow via crafted url ,
+    thanks Niko Golde (closes: #464532)
+  * fix SVN25824 for
+    CVE-2008-0629, buffer overflow via crafted cddb title
+    thanks Niko Golde (closes: #464533)
+  * fix for CVE-2008-0485 Array index error in libmpdemux/demux_mov.c
+    a.k.a.  CORE-2007-1218: MPlayer 1.0rc2 buffer overflow vulnerability
+    thanks Stefan Fritsch
+  * fix for CVE-2008-0486 Array index vulnerability in libmpdemux/demux_audio.c
+    a.k.a.  CORE-2008-0122: MPlayer arbitrary pointer dereference
+    thanks Stefan Fritsch (closes: #464060)
+  
+ -- A Mennucc1 <mennucc1@debian.org>  Fri,  8 Feb 2008 20:42:41 +0100
+
+mplayer (1.0~rc2-7) unstable; urgency=low
+
+  * fix segfault on GNU/kFreeBSD, by moving a patch from
+    debian/patches/25kFreeBDS.dpatch directly to debian/rules itself,
+    thanks to Petr Salinger (Closes: #457312).
+  * really remove /etc/init.d/mplayer and /etc/rc... files (used <
+    1.0~rc2-1), thanks to Kumar Appaiah & piuparts (Closes: #454710).
+  * Avoid 'echo -e' bashism in postinst (now uses /bin/echo ),
+    thanks to Helmut Grohne (Closes: #451551).
+  * delete  config.h config.mak from diff.gz,
+    thanks to Fabian Greffrath (Closes: #451381).
+  * [INTL:sk] Slovak po-debconf translation,
+    thanks to helix84@centrum.sk (Closes: #440717).
+  * enable jack support, thanks to Free Ekanayaka (Closes: #440461).
+  * Document 22disable-xscreensaver.dpatch
+  * Bump standard to 3.7.3.0 :
+    - menu for "/usr/bin/gmplayer" goes in section="Applications/Video"
+    - added Homepage and Vcs fields
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sat, 29 Dec 2007 13:08:22 +0000
+
+mplayer (1.0~rc2-6) unstable; urgency=low
+
+  * created debhelper debian/compat '5'
+  * corrected mplayer.menu to section="Applications/Viewers"
+  * fix: cant open a file with spaces in the name through nautilus,
+    thanks to giggz (Closes: #449298)
+  * fix: 2xsai filter generates side-by-side double-height images on amd64, 
+    thanks to Josh Triplett and  Reimar Döffinger (Closes: #450999)
+  * clean up of 10configure-alpha.dpatch and 12configure-vidix-alpha.dpatch
+  * Debconf templates and debian/control reviewed by the
+    debian-l10n-english team as part of the Smith review project.
+    Thanks to Christian Perrier. 
+    Closes: #447111, #448247, #412394, #414510, #448247
+  [Debconf translation updates]
+  * Belarusian. Thanks Andrei Darashenka. Closes: #447115, #447305
+  * Galician. Thanks Jacobo Tarrio. Closes: #447300
+  * French Thanks Yves Rütschlé. Closes: #448844
+  * Finnish. Thanks Esko Arajärvi. Closes: #447349
+  * Spanish; Castilian. Thanks Javier Fernández-Sanguino Peña. Closes: #447416
+  * Czech. Thanks Miroslav Kure. Closes: #447439
+  * Portuguese. Thanks "traduz" Carlos Lisboa. Closes: #447800
+  * Vietnamese. Thanks Clytie Siddall. Closes: #447873
+  * Romanian. Thanks Eddy Petrișor. Closes: #447922
+  * Dutch; Flemish. Thanks "cobaco". Closes: #448120
+  * Italian. Thanks Luca Monducci. Closes: #448237
+  * German. Thanks Helge Kreutzmann. Closes: #448246
+  * Malayalam. Thanks Santhosh Thottingal. Closes: #448468
+  * Russian. Thanks Sergey Alyoshin. Closes: #449000
+
+ -- A Mennucc1 <mennucc1@debian.org>  Wed, 14 Nov 2007 15:49:04 +0100
+
+mplayer (1.0~rc2-5) unstable; urgency=low
+
+  * patch to play rtsp stream (hack to skip short packets)
+    thanks to Stefan Strasser,  Reimar Döffinger  (Closes: #410424).
+  * the bug "mplayer segfaults on ogg video" was actually a libtheora bug,
+    fixed in 1.0~beta1-1 or above: added dependency.
+    Thanks to Pierre Habouzit,  Reimar Döffinger  (Closes: #408071).
+  * Fix FTBFS on GNU/kFreeBSD, thanks to Petr Salinger (Closes: #448791).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 04 Nov 2007 12:56:38 +0000
+
+mplayer (1.0~rc2-4) unstable; urgency=low
+
+  * fix: _vorbis_block_alloc() implicitly converted to pointer,
+    thanks to dann frazier (Closes: #447278).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 19 Oct 2007 21:01:17 +0200
+
+mplayer (1.0~rc2-3) unstable; urgency=low
+
+  * vidix drivers cyberblade sis unichrome fail on alpha, and are probably
+    useless but in x86_32 and x86_64 archs
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 19 Oct 2007 18:10:59 +0200
+
+mplayer (1.0~rc2-2) unstable; urgency=low
+
+  * Runtime CPU detection only works for x86, x86-64 and PPC
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 19 Oct 2007 09:43:08 +0200
+
+mplayer (1.0~rc2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Remove RTC debconf question and /etc/init.d/mplayer (Closes: #421363)
+  * Use dpatch.
+  
+ -- A Mennucc1 <mennucc1@debian.org>  Wed, 18 Oct 2007 19:27:16 +0200
+
+mplayer (1.0~rc1-16.1) unstable; urgency=high
+
+  * Non-maintainer upload by testing security team.
+  * Check wLongsPerEntry in aviheader.c before using it to prevent
+    possible NULL pointer dereference (CVE-2007-4938) (Closes: #443478).
+
+ -- Nico Golde <nion@debian.org>  Tue, 25 Sep 2007 12:39:15 +0200
+
+mplayer (1.0~rc1-16) unstable; urgency=low
+
+  * compile for --mcpu=ev5 on alpha; fixes "Illegal instruction on EV56",
+    thanks to Tom Evans & Ivan Jager (Closes: #431139).
+  * removed debian/patches (Closes: #409352).
+  * correct mplayer.config to respect font default, thanks Simon Ruggier.
+  * linked with liblivemedia,    thanks to Hilmar Preusse (Closes: #440338).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sat, 01 Sep 2007 12:27:16 +0000
+
+mplayer (1.0~rc1-15) unstable; urgency=low
+
+  * Bug fix: "Depends on libconfhelper-perl, but this package has been
+    removed", thanks to David (Closes: #434509).
+  * Bug fix: "correction for binary_codecs.sh", thanks to nutzteil@web.de
+    (Closes: #431537).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Wed,  1 Aug 2007 11:54:40 +0200
+
+mplayer (1.0~rc1-14) unstable; urgency=high
+
+  * fix for stack overflow in the code used to handle cddb queries,
+    CVE-2007-2948 and SAID 24302, thanks Stefan Cornelius of Secunia Research
+  * do not use libmad0, on request of upstream
+  * [INTL:ml] Malayalam debconf template translation
+    thanks to Santhosh Thottingal (Closes: #419527).
+  * [INTL:it] Italian debconf templates translation
+    thanks to Luca Monducci (Closes: #425259).
+  * [l10n:ro] Romanian debconf templates translation
+    thanks to Eddy Petrișor (Closes: #415368).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Wed,  6 Jun 2007 10:17:22 +0200
+
+mplayer (1.0~rc1-13) unstable; urgency=low
+  
+  * fix for CVE-2007-1246 and similar (Closes: #414075)
+    thanks Kees Cook & Moritz Jodeitand & R Togni
+    patches for files
+      loader/dmo/DMO_VideoDecoder.c from SVN 22204
+      loader/dshow/DS_VideoDecoder.c from SVN 22205
+  * [INTL] Japanese po-debconf templates translation,
+     thanks to Kobayashi Noritada (Closes: #413120).
+  * [INTL] Dutch po-debconf translation, thanks cobaco (Closes: #413880)
+  * [INTL] Russian po-debconf translation, thanks  Yuri Kozlov (Closes: #414251)
+  * patch for ia64 unaligned access crash,
+     thanks to Bryan Stillwell for debugging &  
+      Reimar Döffinger for the patch (Closes: #409431).
+  * mplayer-doc: add doc-base documentation indexes,
+     thanks to Martintxo (Closes: #405945).
+  * binary_codecs.sh: check MD5 on downloaded stuff (Closes: #405371).
+  * binary_codecs.sh: check if bzip2 is there, and bail out 
+      graciously otherwise; if untarring fails, allow for retry.
+    Fixes "binary_codecs.sh doesn't install already downloaded codecs",
+    thanks to Ingo Bressler for problem analysis (Closes: #413063).
+  * binary_codecs.sh: do not use fping (my code lost part of URLs) (closes: #399144)
+  * binary_codecs.sh: warn that essential-ppc codecs need libstdc++5, thanks to
+     Bin Zhang (Closes: #404473) for pointing out.
+  * enable smb:// (Closes: #412079).
+  * mplayer.postinst: when vo=x11 or vo=fbdev, zoom=1 is set as well,
+     thanks to Robert Millan (Closes: #412252).
+  *  -stop-xscreensaver option disables  gnome-screensaver as well
+     (but only if cursor is inside mplayer window) , thanks Adam Tlałka
+     and Reimar Döffinger (Closes: #404975).
+  * [INTL] fix small typo in English template, thanks cobaco  (closes: #414393)
+  * [INTL] devices.html -> video.html , thanks cobaco  (closes: #414392)
+  * [INTL] True Type -> TrueType , thanks cobaco  (closes: #414394)
+  * [INTL] ~/.mplayer/mplayer.conf -> ~/.mplayer/config , 
+     thanks Jacobo Tarrio (closes: #408055)
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sat, 10 Mar 2007 12:57:16 +0100
+  
+mplayer (1.0~rc1-12) unstable; urgency=medium
+
+  * (possible) security fixes  backported from SVN
+     7585  7586  7591   for  libavcodec/h264.c
+     7640  7650         for  libavformat/asf.c
+     all thanks to Michael Niedermeyer
+  * Czech debconf translation;  thanks to Miroslav Kure (Closes: #408626).
+  * Portuguese debconf translation; thanks to Traduz! (Closes: #408449).
+  * Swedish debconf translation; thanks to Andreas Henriksson (Closes: #407864).
+  * binary_codecs.sh should specify umask;
+     thanks to Linas Žvirblis (Closes: #406346).
+  * clarify dependencies (do not pick up them randomly!),
+     thanks to EspeonEefi (Closes: #405170);
+     debian/rules: when configuring, disable also: arts , jack , aa , dv , smb 
+     debian/control: depend on: lzo, speex, dts, ladspa, gl (mesa)
+  * the above adds opengl video output (Closes: #400934).
+  * forked processes cannot use GTK gui; this fixes bug in caching streams
+     in gmplayer (Closes: #396962)
+     thanks to martin f krafft  and Reimar Döffinger for patch.
+  * added in debian/patches all patches that I applied or I am working on
+  
+ -- A Mennucc1 <mennucc1@debian.org>  Wed, 31 Jan 2007 10:30:24 +0100
+
+mplayer (1.0~rc1-11) unstable; urgency=high
+
+  * fix for CVE-2006-6172
+  * fixed "typo in the README.Debian", thanks to Aurelien
+    Jacobs (Closes: #403893).
+  * another (last?) fix for  (Closes: #402950), thanks Sam Hocevar.
+
+ -- A Mennucc1 <mennucc1@debian.org>  Thu, 28 Dec 2006 23:03:42 +0100
+
+mplayer (1.0~rc1-10) unstable; urgency=high
+
+  * really apply patch for (Closes: #403379)
+  * many fixes to various codecs, to prevent crashes on 
+    randomly altered streams
+
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 18 Dec 2006 11:46:35 +0100
+
+mplayer (1.0~rc1-9) unstable; urgency=low
+
+  * fix another segfault on (broken) MPEGs without I frames (Closes: #403379).
+  * fix: binary_codecs.sh failed to install essential-ppc
+    codecs, thanks to Bin Zhang (Closes: #403442).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 17 Dec 2006 13:06:43 +0100
+
+mplayer (1.0~rc1-8) unstable; urgency=low
+
+  * fix segfault on (broken) MPEGs without I frames, (Closes: #402922).  
+  * README.Debian: document apt pinning and debian-multimedia
+  * can be compiled with --enable-debug (Closes: #402920).
+  * supports DEB_BUILD_OPTIONS=nostrip/noopt (Closes: #402950)
+    (see README.Debian, though, for gory details)
+  * Spanish po-debconf translation", thanks
+    to Javier Fernández-Sanguino Peña (Closes: #402205).
+  * patch to compile in GNU/kFreeBSD, thanks to Petr Salinger (Closes: #402872).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 15 Dec 2006 14:40:54 +0100
+
+mplayer (1.0~rc1-7) unstable; urgency=low
+
+  * Bug fix: "mplayer: FTBFS on AMD64", thanks to Emfox Zhou (Closes:
+    #401893).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Thu,  7 Dec 2006 14:26:10 +0100
+
+mplayer (1.0~rc1-6) unstable; urgency=low
+
+  * debian/control : update mantainer fields
+  * debian/scripts/binary_codecs.sh : 'wget -c -N' -> 'wget -N'
+  * update debian/prefs/codecs_list and mirrors    (closes: #399144)
+  * debian/rules : x86_64  -> amd64   (closes: #401697)
+  * applied patch (that should support codecs in amd64 )
+    http://people.freedesktop.org/~jinghua/real64/mplayer-amd64-real-codecs.diff
+  * update french translation (closes: #400106)
+  * update german translation (closes: #400296)
+  * (again!) set --with-codecsdir to avoid broken default; thanks to Emfox Zhou
+    (Closes: #396017).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Wed,  6 Dec 2006 10:56:02 +0100
+
+mplayer (1.0~rc1-5) unreleased; urgency=low
+
+  * this version was built with external ffmpeg 0.svn6767
+    it is in  http://tonelli.sns.it/pub/mplayer/experimental-shared
+
+ -- A Mennucc <debdev@tonelli.sns.it>  Mon, 27 Nov 2006 15:03:02 +0100
+
+mplayer (1.0~rc1-4) unstable; urgency=low
+
+  * Depends on mplayer-skin
+  * Use fontconfig in /etc/mplayer/mplayer.conf , so that 'Sans' is
+    always a fallback; this solves:
+    "OSD missing numbers/letters", thanks to Sam Morris (Closes: #396531).
+    if fc-list is available, let the user choose between a huge list as well
+  * Bug fix: "mplayer: depends exclusively on debconf (debconf-2.0 should
+    be an alternative)", thanks to Eddy Petrișor (Closes: #397891).
+  * Patches from Diego Biurrun  :
+    - README.jfdct.gz  is already copied inside
+        libavcodec/jfdctfst.c  libavcodec/jfdctint.c
+    - do not use external libdv (ffmpeg has internally a better one)
+    - rename win32codecs.sh to binary_codecs.sh,
+  * Bug fix: "mplayer: win32codecs.sh will not uninstall", thanks to Joey
+    Morris (Closes: #397867) and Diego for the patch.
+  * Applied some changes in debconf template, thanks to Helge
+    Kreutzmann (Closes: #397819).
+  * Supports caca (Closes: #397749).
+  * "Initial German debconf translation",
+     thanks to Helge Kreutzmann (Closes: #397822).
+  * "French program translation", thanks to Yves  Rutschle (Closes: #398515).
+  * Bug fix: "FTBFS: bashisms in build scripts", thanks to
+    Florent Bayle (Closes: #396450).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 19 Nov 2006 21:06:01 +0100
+
+mplayer (1.0~rc1-3) unstable; urgency=low
+
+  * Bug fix: "Outdated info in /usr/share/doc/mplayer/README.Debian",
+    thanks to Sam Morris (Closes: #396281).
+  * set --with-codecsdir to avoid broken default; thanks to Emfox Zhou
+    (Closes: #396017).
+
+ -- A Mennucc1 <mennucc1@debian.org>  Tue, 31 Oct 2006 09:13:32 +0100
+
+mplayer (1.0~rc1-2) unstable; urgency=low
+
+  * rewrote mplayer.{config,template,postinst} ; this also fixes
+    "mplayer: Strange contents of default config file", thanks to
+    Sam Morris (Closes: #395829).
+  * Reviewed description, thanks to Filipus Klutiero (Closes: #395540).
+  * Use po-debconf
+  [Diego suggested:]
+  * Don't install codecs.conf. If people fiddle w/ it, playback *will* break.
+  * --disable-bitmap-font, so no more 
+    "annoying message on 'ttf doesn't look like a bitmap '",
+    thanks to Michael Piefel (Closes: #395325) and Diego
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sat, 28 Oct 2006 17:49:41 +0200
+
+mplayer (1.0~rc1-1) unstable; urgency=low
+
+  * New upstream release
+  * -nortc is now default since -rtc has disadvantages with recent kernels
+    ( so the  mplayer/rtc question is now low priority, defaults to false )
+  * do not pass --enable-directfb (it fails)
+  * reorganized debian/rules file (Closes: #395238,#395240,#395303).
+  * reformat of scripts/win32codecs.sh
+
+ -- A Mennucc1 <mennucc1@debian.org>  Thu, 26 Oct 2006 12:55:33 +0200
+
+mplayer (1.0~rc1~svn20199-1) unstable; urgency=low
+
+  * code pulled from SVN 
+    (and some dirs deleted : see 'debian/rules fix-orig-source')
+  * do not depend on xmms
+  * build libraries with -fPIC
+  * ship in examples dir: etc/menu.conf etc/input.conf etc/codecs.conf
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 13 Oct 2006 11:41:47 +0200
+
+mplayer (1.0~rc1~svn19921) unstable; urgency=low
+
+  * code pulled from SVN 
+    (and some dirs deleted : see 'debian/rules fix-orig-source')
+  * better debian/copyright file
+  * fixed some lintian issues
+  * new debian/rules targets that build a tar from SVN
+  * updated various README.Debian files (regarding all the
+    upstream code not shipped into Debian)
+  * 'debian/rules autocontrol' ( generates  control.in -> control )
+    also adds dependencies for creating docs (if it is needed)
+  * in debconf, question  on -vo is low priority, default is "autodetect"
+    (that is, no setting)
+  * mplayer init supports LSB
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 21 Sep 2006 10:08:27 +0200
+
+mplayer (1.0pre8-1) unstable; urgency=low
+
+  * New upstream release
+  * better debian/copyright file
+  * do not ship a skin
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 30 Jul 2006 12:25:14 +0200
+
+mplayer (1.0pre7try2-1) unstable; urgency=low
+
+  * New upstream release
+  * changed DEB_BUILD_OPTIONS to DEB_BUILD_CONFIGURE ,
+    DEB_BUILD_OPTIONS is used as in debian policy
+  * use gcc-3.4
+  * changed xlibs-dev to a long list of dependencies, for Debian/etch
+  * try to adhere to  http://www.mplayerhq.hu/DOCS/tech/binary-packaging.txt
+    (see README.Debian for details)
+  * removed dependency on xlibmesa-dev, disabled opengl
+
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 16 Jan 2006 11:47:33 +0100
+
+mplayer (1.0pre7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 24 Apr 2005 19:34:33 +0200
+
+mplayer (1.0pre6a-4) unstable; urgency=low
+
+  * Simon McVittie <hacks@pseudorandom.co.uk> wonderful work:
+  - Work around Debian bug #267442 (glibc's sys/uio.h and gcc's altivec.h have
+    conflicting uses for __vector) by re-ordering #includes
+  - Fix potential symlink attack in ./configure
+  - Disable support for binary codecs on platforms for which those codecs
+    aren't available; also disable the corresponding Debconf note when it's
+    inappropriate
+  - Changed Build-Depends: so it works in pbuilder
+  - Explicitly build-depend on libjpeg62-dev, libfontconfig1-dev,
+    libungif4-dev 
+  - Tweak debian/rules to avoid certain errors being ignored
+  - Use --language=all
+
+ -- A Mennucc1 <mennucc1@debian.org>  Sat,  5 Mar 2005 22:24:57 +0100
+
+mplayer (1.0pre6a-3) unstable; urgency=low
+
+  * provide a target  'debian/rules get-orig-source' 
+    that recreates the orig.tar.gz ; then use the above orig.tar.gz
+  * rewrote some parts of debian/rules
+  * don't clean and recompile docs if upstream ships them
+  * mplayer-doc was shipping too much stuff
+  * translated man pages where not installed properly
+  * compile with libdv4-dev
+  * correct README.Debian
+
+ -- A Mennucc1 <mennucc1@debian.org>  Tue, 20 Feb 2005 14:30:19 +0100
+
+mplayer (1.0pre6a-2) unstable; urgency=low
+
+  * Forgot build-dep on libtheora
+  * Must not depend on libxvidcore
+
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 14 Feb 2005 14:47:56 +0100
+
+mplayer (1.0pre6a-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 11 Feb 2005 19:33:42 +0100
+
+mplayer (1.0-cvs20030324-2) unstable; urgency=low
+
+  * some corrections, as suggested Diego Biurrun
+    - binary codecs should go into /usr/lib/codecs (upstream default)
+    - better template 'mplayer/install_codecs'
+    - an empty 'font=' in mplayer.conf breaks mplayer: postinst corrected
+  * correction in 'mplayer/cfgnote'
+  * better mplayer.postinst and mplayer.config
+  
+ -- A Mennucc1 <mennucc1@debian.org>  Sun, 18 Apr 2004 17:25:37 +0200
+
+mplayer (1.0.cvs20030324-1) unstable; urgency=low
+
+  * following the discussion started by Diego Biurrun <diego@biurrun.de>
+    in debian-devel, I have prepared a new packaging of 'mplayer'
+    (with code that comes from CVS)
+  * the upstream tar.bz cannot be distributed by Debian, since it contains
+     CSS code; so I am repackaging it 
+  * I have tried my best to address all known issues:
+    - the package contains the detailed Copyright made by Diego Biurrun 
+    - the package does not contain CSS code, or  AFAIK other code on which 
+       there is active patent enforcement
+    - there is a script  debian/cvs-changelog.sh  that shows all changes
+       done to files included in this source.
+      This should comply with GPLv2 sec 2.a  (in spirit if not in letter)
+      For this reason, the source code contains CVS directories.
+  * needs   make (>= 3.80) for 'html-chunked-$(1)' in DOCS/xml/Makefile
+  
+ -- A Mennucc1 <mennucc1@debian.org>  Wed, 30 Mar 2004 18:04:06 +0100
+
+mplayer (0.90-3) unstable; urgency=low
+
+  * changed description to stress that the .tar.gz in Debian is different from
+    the upstream (following suggested by Edward Block)
+  * --enable-fbdirect in configure
+  * uploaded to Debian
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri,  1 Aug 2003 16:21:50 +0200
+
+mplayer (0.90-2) unstable; urgency=low
+
+  * removed all CSS code. Now mplayer use lib dvdread 
+
+ -- A Mennucc1 <mennucc1@debian.org>  Fri, 25 Jul 2003 10:50:26 +0200
+
+mplayer (0.90-1) unstable; urgency=low
+
+  * uploaded to Debian. The source code was scrutinized for 
+  licenses and copyrights. Read copyright for a detailed discussion.
+  
+ -- A Mennucc1 <mennucc1@debian.org>  Wed, 23 Jul 2003 09:45:41 +0200
+
+mplayer (0.90) unstable; urgency=low
+
+  * version bumped
+
+ -- Gabucino <gabucino@mplayerhq.hu>  Sun, 16 Feb 2003 11:02:51 +0100
+
+mplayer (0.90rc4-1) unstable; urgency=low
+ 
+  * new rc-release
+ 
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 24 Feb 2003 18:40:13 +0100
+ 
+mplayer (0.90rc3-2) unstable; urgency=low
+ 
+  * configure: --disable-dvdnav --enable-mpdvdkit --disable-aa --disable-ggi
+    on suggestions from author(s)
+ 
+ -- A Mennucc1 <mennucc1@debian.org>  Thu, 23 Jan 2003 14:12:50 +0100
+ 
+mplayer (0.90rc3-1) unstable; urgency=low
+ 
+  * show notes in config, not template
+  * default device in Debian is usually /dev/cdrom, not /dev/dvd
+
+ -- A Mennucc1 <mennucc1@debian.org>  Mon, 20 Jan 2003 15:54:57 +0100
+ 
+mplayer (0.90rc2-5) unstable; urgency=low
+ 
+  * ftp-installer: Please read README.Debian.2
+  * other adjustments to debian/*
+  * notes in the templates were not showing, due to a missing go();
+  
+ -- A Mennucc1 <mennucc1@debian.org>  Thu, 16 Jan 2003 10:02:43 +0100
+ 
+mplayer (0.90rc2-4) unstable; urgency=low
+ 
+  * #DEBHELPER# in postinst was not working OK (not passing arguments)
+  * template mplayer/install_codecs was not showing
+  
+ -- Andrea Mennucc <debdev@Tonelli.sns.it>  Tue, 14 Jan 2003 09:48:44 +0100
+
+mplayer (0.90rc2-3) unstable; urgency=low
+ 
+   * Thanks to Nagy for teaming up. His are mime and conffile and scripts.
+  
+ -- Andrea Mennucc <debdev@Tonelli.sns.it>  Mon, 13 Jan 2003 16:46:22 +0100
+ 
+mplayer (0.90rc2-2) unstable; urgency=low
+ 
+  * pass control to debconf scripts in postinst and postrm
+  * purge debconf database on purge.
+ 
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Sun, 12 Jan 2003 15:01:38 +0100
+  
+mplayer (0.90rc3-0) unstable; urgency=low
+
+  * new release.
+
+ -- Gabucino <gabucino@mplayerhq.hu>  Mon, 16 Dec 2002 22:03:55 +0100
+
+mplayer (0.90rc1-0) unstable; urgency=low
+
+  * new release.
+  * now compiled with --enable-runtime-cpudetection for safety reasons.
+    Disable it for slightly better performance, but the package will run only
+    on the CPU the build machine had.
+  * updated package description
+
+ -- Gabucino <gabucino@mplayerhq.hu>  Sun, 24 Nov 2002 17:01:12 +0100
+
+mplayer (0.90pre9-0) unstable; urgency=low
+
+  * new release.
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Mon, 21 Oct 2002 22:30:06 +0200
+
+mplayer (0.90pre8-0) unstable; urgency=low
+
+  * new release, fix version, we are not at 0.90, we're still at preX
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Thu, 19 Sep 2002 09:50:43 +0200
+
+mplayer (0.90-4) unstable; urgency=low
+
+  * Fix package building by adding BINDIR.
+
+ -- Diego Biurrun <diego@biurrun.de>  Wed,  4 Sep 2002 00:49:03 +0200
+
+mplayer (0.90-3) unstable; urgency=low
+
+  * Remove configuration files on purge.
+
+ -- Diego Biurrun <diego@biurrun.de>  Sun,  1 Sep 2002 11:03:13 +0200
+
+mplayer (0.90-2) unstable; urgency=low
+
+  * Use the confdir we compile with in the helper scripts
+    (/etc/mplayer/mplayer.conf instead of /etc/mplayer).
+
+ -- Diego Biurrun <diego@biurrun.de>  Tue, 27 Aug 2002 11:18:50 +0200
+
+mplayer (0.90-1) unstable; urgency=low
+
+  * 0.90 release including latest alsa9 fixes
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Wed,  3 Jul 2002 23:32:49 +0200
+
+mplayer (0.90pre5-1) unstable; urgency=low
+
+  * rc1 to become 0.90
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Fri,  7 Jun 2002 15:31:20 +0200
+
+mplayer (0.90pre4-1) unstable; urgency=low
+
+  * new pre-release
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Mon, 13 May 2002 08:06:34 +0200
+
+mplayer (0.90pre3-1) unstable; urgency=low
+
+  * new pre-release
+  * gtk bug fixed.
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Tue, 30 Apr 2002 11:32:43 +0200
+
+mplayer (0.90pre2-1) unstable; urgency=low
+
+  * new release.
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Sun, 21 Apr 2002 12:49:35 +0200
+
+mplayer (0.60-3) unstable; urgency=low
+
+  * install xvidix correctly 
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Sun, 17 Mar 2002 16:38:54 +0100
+
+mplayer (0.60-2) unstable; urgency=low
+
+  * This is meaningless, just to mark that more then 2 months have passed
+    since last release and lots of thing in mplayer have changed. 
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Thu,  7 Mar 2002 00:34:20 +0100
+
+mplayer (0.60-1) unstable; urgency=low
+
+  * Post 0.60 release.
+  * Changed installation - make install now handles codecs.conf, manpages
+  *  and fontdir, so we now use make install for those.
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Fri,  4 Jan 2002 11:28:54 +0100
+
+mplayer (0.60pre2-1) unstable; urgency=low
+
+  * 0.60 pre2 release
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Fri, 28 Dec 2001 22:12:54 +0100
+
+mplayer (0.60pre1-1) unstable; urgency=low
+
+  * 0.60 pre-release.
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Tue, 25 Dec 2001 00:47:36 +0100
+
+mplayer (0.50-3) unstable; urgency=low
+
+  * debian/rules: improve install routine; will include mencore if it is
+    built
+  * debian/control: remove invalid source recommends
+  * debian/copyright: mention that binary distribution is not allowed
+  * debian/rules: install /usr/share/mplayer/codecs.conf; this should
+    probably be a config file
+  * turn on fbdev option
+
+ -- Adam Di Carlo <aph@debian.org>  Sat, 15 Dec 2001 03:33:44 -0500
+
+mplayer (0.50-2) unstable; urgency=low
+
+  * gui added to package/menu 
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Wed,  7 Nov 2001 11:31:46 +0100
+
+mplayer (0.50-1) unstable; urgency=low
+
+  * 0.50 released.
+
+ -- Dariush Pietrzak <eyck@ghost.anime.pl>  Fri, 12 Oct 2001 13:26:03 +0200
+
+mplayer (0.18-4) unstable; urgency=low
+
+  * Changes to debian packaging suggested Josip Rodin 
+
+ -- Dariush Pietrzak <eyck@ghost.forumakad.pl>  Wed, 22 Aug 2001 22:40:58 +0200
+
+mplayer (0.18-3) unstable; urgency=low
+
+  * fixed templates. 
+
+ -- Dariush Pietrzak <eyck@ghost.tinet.pl>  Sat, 28 Jul 2001 09:45:45 +0200
+
+mplayer (0.18-2) unstable; urgency=low
+
+  * modified debian scripts 
+
+ -- Dariush Pietrzak <eyck@ghost.tinet.pl>  Fri, 27 Jul 2001 09:25:52 +0200
+
+mplayer (0.18-1) unstable; urgency=low
+
+  * lots of changes in mplayer 
+
+ -- Dariush Pietrzak <eyck@incubus.ar.lublin.pl>  Mon, 25 Jun 2001 15:59:18 +0200
+
+mplayer (0.17a-2) unstable; urgency=low
+
+  * mplayer.conf file, automatic menu files update 
+
+ -- Dariush Pietrzak <eyck@incubus.ar.lublin.pl>  Sun, 20 May 2001 22:50:41 +0200
+
+mplayer (0.17a-1) unstable; urgency=low
+
+  * Version change, debian scripts update (rm), maintainer switch
+
+ -- Dariush Pietrzak <eyck@incubus.ar.lublin.pl>  Thu, 17 May 2001 13:25:12 +0200
+
+mplayer (0.11pre-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- * TeLeNiEkO * <telenieko@telenieko.com>  Mon, 26 Feb 2001 12:24:04 +0100
--- mplayer-1.0~rc3+svn20090426.orig/debian/include/vdpau/vdpau_x11.h
+++ mplayer-1.0~rc3+svn20090426/debian/include/vdpau/vdpau_x11.h
@@ -0,0 +1,174 @@
+/*
+ * This source file is documented using Doxygen markup.
+ * See http://www.stack.nl/~dimitri/doxygen/
+ */
+
+/*
+ * 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.
+ */
+
+/**
+ * \file vdpau_x11.h
+ * \brief X11 Window System Integration Layer
+ * 
+ * This file contains the \ref api_winsys_x11 "X11 Window System 
+ * Integration Layer". 
+ */ 
+ 
+#ifndef _VDPAU_X11_H
+#define _VDPAU_X11_H
+
+#include <X11/Xlib.h>
+#include "vdpau.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \ingroup api_winsys 
+ * @{ 
+ */
+
+/**
+ * \defgroup api_winsys_x11 X11 Window System Integration Layer
+ *  
+ * The set of VDPAU functionality specific to usage with the X 
+ * Window System.
+ *  
+ * \section Driver Library Layout 
+ *  
+ * An X11-oriented VDPAU installation consists of the following 
+ * components: 
+ *  
+ * - Header files. These files are located in the standard 
+ *   system header file path.
+ *   - \c vdpau/vdpau.h
+ *   - \c vdpau/vdpau_x11.h
+ * - The VDPAU wrapper library. These files are located in the 
+ *   standard system (possibly X11-specific) library path.
+ *   - \c libvdpau.so.1 (runtime)
+ *   - \c libvdpau.so (development)
+ * - Back-end driver files. These files are located in the 
+ *   standard system (possibly X11-specific) library path.
+ *   - \c libvdpau_\%s.so
+ *   For example:
+ *   - \c libvdpau_nvidia.so
+ *   - \c libvdpau_intel.so
+ *   - \c libvdpau_ati.so
+ *  
+ * The VDPAU wrapper library implements just one function; \ref 
+ * vdp_device_create_x11. The wrapper will implement this function 
+ * by dynamically loading the appropriate back-end driver file 
+ * mentioned above. Long-term, the wrapper will use a
+ * VDPAU-specific X  extension to determine which back-end driver
+ * to load. Currently, the wrapper library hard-codes the driver
+ * name as "nvidia", although this can be overridden using the 
+ * environment variable VDPAU_DRIVER.
+ *
+ * The back-end driver is expected to implement a function named 
+ * \b vdp_imp_device_create_x11. The wrapper will call this function to
+ * actually implement the \ref vdp_device_create_x11 application call. 
+ *  
+ * Note that it is theoretically possible for an application to 
+ * create multiple \ref VdpDevice "VdpDevice" objects. In this 
+ * case, the wrapper library may load multiple back-end drivers 
+ * into the same application, and/or invoke a specific back-end 
+ * driver's \b VdpImpDeviceCreateX11 multiple times. The wrapper 
+ * libray imposes no policy regarding whether the application 
+ * may instantiate multiple \ref VdpDevice "VdpDevice" objects for
+ * the same display and/or screen. However, back-end drivers are 
+ * free to limit the number of \ref VdpDevice "VdpDevice" objects 
+ * as required by their implementation. 
+ *  
+ * @{ 
+ */
+
+/** 
+ * \brief Create a VdpDevice object for use with X11. 
+ * \param[in] display The X Display that the VdpDevice VdpDevice
+ *       will operate against.
+ * \param[in] screen The X screen that the VdpDevice will operate 
+ *       against.
+ * \param[out] device The new device's handle. 
+ * \param[out] get_proc_address The get_proc_address entry point 
+ *       to use with this device.
+ * \return VdpStatus The completion status of the operation. 
+ */
+typedef VdpStatus VdpDeviceCreateX11(
+    Display *             display,
+    int                   screen,
+    /* output parameters follow */
+    VdpDevice *           device,
+    VdpGetProcAddress * * get_proc_address
+);
+
+/** 
+ * \brief Create a VdpDevice object for use with X11. 
+ * This is an actual symbol of type \ref VdpDeviceCreateX11
+ * 
+ */
+VdpDeviceCreateX11 vdp_device_create_x11;
+
+/** 
+ * \brief Create a VdpPresentationQueueTarget for use with X11.
+ * \param[in] device The device that will contain the queue 
+ *       target.
+ * \param[in] drawable The X11 Drawable that the presentation 
+ *       queue will present into.
+ * \param[out] target The new queue target's handle. 
+ * \return VdpStatus The completion status of the operation. 
+ *
+ * Note: VDPAU expects to own the entire drawable for the duration of time
+ * that the presentation queue target exists. In particular,
+ * implementations may choose to manipulate client-visible X11 window state
+ * as required. As such, it is recommended that applications create a
+ * dedicated window for the presentation queue target, as a child
+ * (grand-child, ...) of their top-level application window.
+ *
+ * Applications may also create child-windows of the presentation queue
+ * target, which will cover any presented video in the normal fashion. VDPAU
+ * implementations will not manipulate such child windows in any fashion.
+ */
+typedef VdpStatus VdpPresentationQueueTargetCreateX11(
+    VdpDevice                   device,
+    Drawable                    drawable,
+    /* output parameters follow */
+    VdpPresentationQueueTarget * target
+);
+
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_TARGET_CREATE_X11 (VdpFuncId)(VDP_FUNC_ID_BASE_WINSYS + 0)
+
+/*@}*/
+/*@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
--- mplayer-1.0~rc3+svn20090426.orig/debian/include/vdpau/vdpau.h
+++ mplayer-1.0~rc3+svn20090426/debian/include/vdpau/vdpau.h
@@ -0,0 +1,3972 @@
+/*
+ * This source file is documented using Doxygen markup.
+ * See http://www.stack.nl/~dimitri/doxygen/
+ */
+
+/*
+ * 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.
+ */
+
+/**
+ * \mainpage Video Decode and Presentation API for Unix
+ *  
+ * \section intro Introduction
+ *
+ * The Video Decode and Presentation API for Unix (VDPAU) provides
+ * a complete solution for decoding, post-processing, compositing,
+ * and displaying compressed or uncompressed video streams. These
+ * video streams may be combined (composited) with bitmap content,
+ * to implement OSDs and other application user interfaces.
+ *
+ * \section api_partitioning API Partitioning
+ *
+ * VDPAU is split into two distinct modules:
+ * - \ref api_core
+ * - \ref api_winsys
+ *
+ * The intent is that most VDPAU functionality exists and
+ * operates identically across all possible Windowing Systems.
+ * This functionality is the \ref api_core.
+ *
+ * However, a small amount of functionality must be included that
+ * is tightly coupled to the underlying Windowing System. This
+ * functionality is the \ref api_winsys. Possibly examples
+ * include:
+ * - Creation of the initial VDPAU \ref VdpDevice "VdpDevice"
+ *   handle, since this act requires intimate knowledge of the
+ *   underlying Window System, such as specific display handle or
+ *   driver identification.
+ * - Conversion of VDPAU surfaces to/from underlying Window
+ *   System surface types, e.g. to allow manipulation of
+ *   VDPAU-generated surfaces via native Window System APIs.
+ *
+ * \section objects Object Types
+ *
+ * VDPAU is roughly object oriented; most functionality is
+ * exposed by creating an object (handle) of a certain class
+ * (type), then executing various functions against that handle.
+ * The set of object classes supported, and their purpose, is
+ * discussed below.
+ *
+ * \subsection device_type Device Type
+ *
+ * A \ref VdpDevice "VdpDevice" is the root object in VDPAU's
+ * object system. The \ref api_winsys allows creation of a \ref
+ * VdpDevice "VdpDevice" object handle, from which all other API
+ * entry points can be retrieved and invoked.
+ *
+ * \subsection surface_types Surface Types
+ *
+ * A surface stores pixel information. Various types of surfaces
+ * existing for different purposes:
+ *
+ * - \ref VdpVideoSurface "VdpVideoSurface"s store decompressed 
+ *   YCbCr video frames in an implementation-defined internal
+ *   format.
+ * - \ref VdpOutputSurface "VdpOutputSurface"s store RGB 4:4:4
+ *   data. They are legal render targets for video
+ *   post-processing and compositing operations.
+ * - \ref VdpBitmapSurface "VdpBitmapSurface"s store RGB 4:4:4
+ *   data. These surfaces are designed to contain read-only
+ *   bitmap data, to be used for OSD or application UI
+ *   compositing.
+ *
+ * \subsection transfer_types Transfer Types
+ *
+ * A data transfer object reads data from a surface (or
+ * surfaces), processes it, and writes the result to another
+ * surface. Various types of processing are possible:
+ *
+ * - \ref VdpDecoder "VdpDecoder" objects process compressed video
+ *   data, and generate decompressed images.
+ * - \ref VdpOutputSurface "VdpOutputSurface"s have their own \ref
+ *   VdpOutputSurfaceRender "rendering functionality".
+ * - \ref VdpVideoMixer "VdpVideoMixer" objects perform video
+ *   post-processing, de-interlacing, and compositing.
+ * - \ref VdpPresentationQueue "VdpPresentationQueue" is
+ *   responsible for timestamp-based display of surfaces.
+ *
+ * \section data_flow Data Flow
+ *
+ * Compressed video data originates in the application's memory
+ * space. This memory is typically obtained using \c malloc, and
+ * filled via regular file or network read system calls.
+ * Alternatively, the application may \c mmap a file.
+ *
+ * The compressed data is then processed using a \ref VdpDecoder
+ * "VdpDecoder", which will decompress the field or frame,
+ * and write the result into a \ref VdpVideoSurface
+ * "VdpVideoSurface". This action may require reading pixel data
+ * from some number of other \ref VdpVideoSurface "VdpVideoSurface"
+ * objects, depending on the type of compressed data and
+ * field/frame in question.
+ *
+ * If the application wishes to display any form of OSD or
+ * user-interface, this must be created in a \ref
+ * VdpOutputSurface "VdpOutputSurface".
+ *
+ * This process begins with the creation of \ref VdpBitmapSurface
+ * "VdpBitmapSurface" objects to contain the OSD/UI's static data,
+ * such as individual glyphs.
+ *
+ * \ref VdpOutputSurface "VdpOutputSurface" \ref
+ * VdpOutputSurfaceRender "rendering functionality" may be used
+ * to composite together various \ref VdpBitmapSurface
+ * "VdpBitmapSurface"s and \ref VdpOutputSurface
+ * "VdpOutputSurface"s, into another VdpOutputSurface
+ * "VdpOutputSurface".
+ *
+ * Once video has been decoded, it must be post-processed. This
+ * involves various steps such as color space conversion,
+ * de-interlacing, and other video adjustments. This step is
+ * performed using an \ref VdpVideoMixer "VdpVideoMixer" object.
+ * This object can not only perform the aforementioned video
+ * post-processing, but also composite the video with a number of
+ * \ref VdpOutputSurface "VdpOutputSurface"s, thus allowing complex
+ * user interfaces to be built. The final result is written into
+ * another \ref VdpOutputSurface "VdpOutputSurface".
+ *
+ * Note that at this point, the resultant \ref VdpOutputSurface
+ * "VdpOutputSurface" may be fed back through the above path,
+ * either using \ref VdpOutputSurface "VdpOutputSurface" \ref
+ * VdpOutputSurfaceRender "rendering functionality",
+ * or as input to the \ref VdpVideoMixer "VdpVideoMixer" object.
+ *
+ * Finally, the resultant \ref VdpOutputSurface
+ * "VdpOutputSurface" must be displayed on screen. This is the job
+ * of the \ref VdpPresentationQueue "VdpPresentationQueue" object.
+ *
+ * \image html vdpau_data_flow.png
+ *
+ * \section entry_point_retrieval Entry Point Retrieval
+ *
+ * VDPAU is designed so that multiple implementations can be
+ * used without application changes. For example, VDPAU could be
+ * hosted on X11, or via direct GPU access. 
+ *
+ * The key technology behind this is the use of function
+ * pointers and a "get proc address" style API for all entry
+ * points. Put another way, functions are not called directly
+ * via global symbols set up by the linker, but rather through
+ * pointers.
+ *
+ * In practical terms, the \ref api_winsys provides factory
+ * functions which not only create and return \ref VdpDevice
+ * "VdpDevice" objects, but also a function pointer to a \ref
+ * VdpGetProcAddress function, through which all entry point
+ * function pointers will be retrieved.
+ *
+ * \subsection entry_point_philosophy Philosophy
+ *
+ * It is entirely possible to envisage a simpler scheme whereby
+ * such function pointers are hidden. That is, the application
+ * would link against a wrapper library that exposed "real"
+ * functions. The application would then call such functions
+ * directly, by symbol, like any other function. The wrapper
+ * library would handle loading the appropriate back-end, and
+ * implementing a similar "get proc address" scheme internally.
+ *
+ * However, the above scheme does not work well in the context 
+ * of separated \ref api_core and \ref api_winsys. In this 
+ * scenario, one would require a separate wrapper library per
+ * Window System, since each Window System would have a
+ * different function name and prototype for the main factory
+ * function. If an application then wanted to be Window System
+ * agnostic (making final determination at run-time via some
+ * form of plugin), it may then need to link against two
+ * wrapper libraries, which would cause conflicts for all
+ * symbols other than the main factory function.
+ *
+ * Another disadvantage of the wrapper library approach is the
+ * extra level of function call required; the wrapper library
+ * would internally implement the existing "get proc address"
+ * and "function pointer" style dispatch anyway. Exposing this
+ * directly to the application is slightly more efficient.
+ *
+ * \section threading Multi-threading
+ *
+ * All VDPAU functionality is fully thread-safe; any number of 
+ * threads may call into any VDPAU functions at any time. VDPAU
+ * may not be called from signal-handlers.
+ *  
+ * Note, however, that this simply guarantees that internal 
+ * VDPAU state will not be corrupted by thread usage, and that 
+ * crashes and deadlocks will not occur. Completely arbitrary
+ * thread usage may not generate the results that an application
+ * desires. In particular, care must be taken when multiple
+ * threads are performing operations on the same VDPAU objects.
+ *  
+ * VDPAU implementations guarantee correct flow of surface 
+ * content through the rendering pipeline, but only when 
+ * function calls that read from or write to a surface return to
+ * the caller prior to any thread calling any other function(s)
+ * that read from or write to the surface. Invoking multiple
+ * reads from a surface in parallel is OK.
+ *  
+ * Note that this restriction is placed upon VDPAU function 
+ * invocations, and specifically not upon any back-end 
+ * hardware's physical rendering operations. VDPAU 
+ * implementations are expected to internally synchronize such 
+ * hardware operations. 
+ *  
+ * In a single-threaded application, the above restriction comes 
+ * naturally; each function call completes before it is possible 
+ * to begin a new function call. 
+ *  
+ * In a multi-threaded application, threads may need to be 
+ * synchronized. For example, consider the situation where:
+ *  
+ * - Thread 1 is parsing compressed video data, passing them 
+ *   through a \ref VdpDecoder "VdpDecoder" object, and filling a
+ *   ring-buffer of \ref VdpVideoSurface "VdpVideoSurface"s
+ * - Thread 2 is consuming those \ref VdpVideoSurface 
+ *   "VdpVideoSurface"s, and using a \ref VdpVideoMixer
+ *   "VdpVideoMixer" to process them and composite them with UI.
+ *  
+ * In this case, the threads must synchronize to ensure that 
+ * thread 1's call to \ref VdpDecoderRender has returned prior to 
+ * thread 2's call(s) to \ref VdpVideoMixerRender that use that 
+ * specific surface. This could be achieved using the following 
+ * pseudo-code: 
+ * 
+ * \code
+ * Queue<VdpVideoSurface> q_full_surfaces; 
+ * Queue<VdpVideoSurface> q_empty_surfaces; 
+ *  
+ * thread_1() { 
+ *     for (;;) {
+ *         VdpVideoSurface s = q_empty_surfaces.get();
+ *         // Parse compressed stream here
+ *         VdpDecoderRender(s, ...);
+ *         q_full_surfaces.put(s);
+ *     }
+ * } 
+ *  
+ * // This would need to be more complex if
+ * // VdpVideoMixerRender were to be provided with more
+ * // than one field/frame at a time.
+ * thread_1() { 
+ *     for (;;) {
+ *         // Possibly, other rendering operations to mixer
+ *         // layer surfaces here.
+ *         VdpOutputSurface t = ...;
+ *         VdpPresentationQueueBlockUntilSurfaceIdle(t);
+ *         VdpVideoSurface s = q_full_surfaces.get();
+ *         VdpVideoMixerRender(s, t, ...);
+ *         q_empty_surfaces.put(s);
+ *         // Possibly, other rendering operations to "t" here
+ *         VdpPresentationQueueDisplay(t, ...);
+ *     }
+ * }
+ * \endcode
+ * 
+ * Finally, note that VDPAU makes no guarantees regarding any
+ * level of parallelism in any given implementation. Put another
+ * way, use of multi-threading is not guaranteed to yield any
+ * performance gain, and in theory could even slightly reduce
+ * performance due to threading/synchronization overhead.
+ *  
+ * However, the intent of the threading requirements is to allow
+ * for e.g. video decoding and video mixer operations to proceed 
+ * in parallel in hardware. Given a (presumably multi-threaded) 
+ * application that kept each portion of the hardware busy, this 
+ * would yield a performance increase. 
+ * 
+ * \section endianness Surface Endianness
+ *
+ * When dealing with surface content, i.e. the input/output of 
+ * Put/GetBits functions, applications must take care to access 
+ * memory in the correct fashion, so as to avoid endianness 
+ * issues. 
+ *  
+ * By established convention in the 3D graphics world, RGBA data
+ * is defined to be an array of 32-bit pixels containing packed
+ * RGBA components, not as an array of bytes or interleaved RGBA
+ * components. VDPAU follows this convention. As such,
+ * applications are expected to access such surfaces as arrays
+ * of 32-bit components (i.e. using a 32-bit pointer), and not
+ * as interleaved arrays of 8-bit components (i.e. using an
+ * 8-bit pointer.) Deviation from this convention will lead to
+ * endianness issues, unless appropriate care is taken.
+ * 
+ * The same convention is followed for some packed YCbCr formats
+ * such as \ref VDP_YCBCR_FORMAT_Y8U8V8A8; i.e. they are
+ * considered arrays of 32-bit pixels, and hence should be
+ * accessed as such.
+ * 
+ * For YCbCr formats with chroma decimation and/or planar
+ * formats, however, this convention is awkward. Therefore, 
+ * formats such as \ref VDP_YCBCR_FORMAT_NV12 are defined as
+ * arrays of (potentially interleaved) byte-sized components.
+ * Hence, applications should manipulate such data 8-bits at a
+ * time, using 8-bit pointers.
+ * 
+ * Note that one common usage for the input/output of
+ * Put/GetBits APIs is file I/O. Typical file I/O APIs treat all
+ * memory as a simple array of 8-bit values. This violates the
+ * rule requiring surface data to be accessed in its true native
+ * format. As such, applications may be required to solve
+ * endianness issues. Possible solutions include:
+ * 
+ * - Authoring static UI data files according to the endianness
+ *   of the target execution platform.
+ * - Conditionally byte-swapping Put/GetBits data buffers at
+ *   run-time based on execution platform.
+ *  
+ * Note: Complete details regarding each surface format's 
+ * precise pixel layout is included with the documentation of 
+ * each surface type. For example, see \ref 
+ * VDP_RGBA_FORMAT_B8G8R8A8. 
+ *  
+ * \section video_mixer_usage Video Mixer Usage
+ *  
+ * \subsection video_surface_content VdpVideoSurface Content 
+ *  
+ * Each \ref VdpVideoSurface "VdpVideoSurface" is expected to contain an
+ * entire frame's-worth of data, irrespective of whether an interlaced of
+ * progressive sequence is being decoded. 
+ *  
+ * Depending on the exact encoding structure of the compressed video stream,
+ * the application may need to call \ref VdpDecoderRender twice to fill a
+ * single \ref VdpVideoSurface "VdpVideoSurface". When the stream contains an
+ * encoded progressive frame, or a "frame coded" interlaced field-pair, a
+ * single \ref VdpDecoderRender call will fill the entire surface. When the
+ * stream contains separately encoded interlaced fields, two
+ * \ref VdpDecoderRender calls will be required; one for the top field, and
+ * one for the bottom field. 
+ *  
+ * Implementation note: When \ref VdpDecoderRender renders an interlaced
+ * field, this operation must not disturb the content of the other field in
+ * the surface. 
+ *  
+ * \subsection vm_surf_list VdpVideoMixer Surface List
+ *
+ * An video stream is logically composed of a sequence of fields. An
+ * example is shown below, in display order, assuming top field first:
+ *
+ * <pre>t0 b0 t1 b1 t2 b2 t3 b3 t4 b4 t5 b5 t6 b6 t7 b7 t8 b8 t9 b9</pre>
+ *
+ * The canonical usage is to call \ref VdpVideoMixerRender once for decoded
+ * field, in display order, to yield one post-processed frame for display.
+ *
+ * For each call to \ref VdpVideoMixerRender, the field to be processed should
+ * be provided as the \b video_surface_current parameter.
+ *
+ * To enable operation of advanced de-interlacing algorithms and/or
+ * post-processing algorithms, some past and/or future surfaces should be
+ * provided as context. These are provided in the \b video_surface_past and
+ * \b video_surface_future lists. In general, these lists may contain any
+ * number of surfaces. Specific implementations may have specific requirements
+ * determining the minimum required number of surfaces for optimal operation,
+ * and the maximum number of useful surfaces, beyond which surfaces are not
+ * used. It is recommended that in all cases other than plain bob/weave, at
+ * least 2 past and 1 future frame be provided. 
+ *
+ * Note that it is entirely possible, in general, for any of the
+ * \ref VdpVideoMixer "VdpVideoMixer" post-processing steps other than
+ * de-interlacing to require access to multiple input fields/frames. For
+ * example, an motion-sensitive noise-reduction algorithm.
+ *
+ * For example, when processing field t4, the \ref VdpVideoMixerRender
+ * parameters may contain the following values, if the application chose to
+ * provide 3 fields of context for both the past and future:
+ *
+ * <pre>
+ * current_picture_structure: VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD
+ * past:    [b3, t3, b2]
+ * current: t4
+ * future:  [b4, t5, b5]
+ * </pre>
+ *
+ * Note that for both the past/future lists, array index 0 represents the
+ * field temporally closest to current, in display order.
+ *
+ * The \ref VdpVideoMixerRender parameter \b current_picture_structure applies
+ * to \b video_surface_current. The picture structure for the other surfaces
+ * will be automatically derived from that for the current picture. The
+ * derivation algorithm is extremely simple; the concatenated list
+ * past/current/future is simply assumed to have an alternating top/bottom
+ * pattern throughout.
+ *
+ * Continuing the example above, subsequent calls to \ref VdpVideoMixerRender
+ * would provide the following sets of parameters:
+ *
+ * <pre>
+ * current_picture_structure: VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD
+ * past:    [t4, b3, t3]
+ * current: b4
+ * future:  [t5, b5, t6]
+ * </pre>
+ *
+ * then:
+ * 
+ * <pre>
+ * current_picture_structure: VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD
+ * past:    [b4, t4, b3]
+ * current: t5
+ * future:  [b5, t6, b7]
+ * </pre>
+ *
+ * In other words, the concatenated list of past/current/future frames simply
+ * forms a window that slides through the sequence of decoded fields.
+ *
+ * It is syntactically legal for an application to choose not to provide a
+ * particular entry in the past or future lists. In this case, the "slot" in
+ * the surface list must be filled with the special value
+ * \ref VDP_INVALID_HANDLE, to explicitly indicate that the picture is
+ * missing; do not simply shuffle other surfaces together to fill in the gap.
+ * Note that entries should only be omitted under special circumstances, such
+ * as failed decode due to bitstream error during picture header parsing,
+ * since missing entries will typically cause advanced de-interlacing
+ * algorithms to experience significantly degraded operation.
+ *
+ * Specific examples for different de-interlacing types are presented below.
+ *
+ * \subsection deint_weave Weave De-interlacing
+ *
+ * Weave de-interlacing is the act of interleaving the lines of two temporally
+ * adjacent fields to form a frame for display.
+ *
+ * To disable de-interlacing for progressive streams, simply specify
+ * \b current_picture_structure as \ref VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME;
+ * no de-interlacing will be applied.
+ *
+ * Weave de-interlacing for interlaced streams is identical to disabling
+ * de-interlacing, as describe immediately above, because each
+ * \ref VdpVideoSurface already contains an entire frame's worth (i.e. two
+ * fields) of picture data.
+ *
+ * Inverse telecine is disabled when using weave de-interlacing.
+ *
+ * Weave de-interlacing produces one output frame for each input frame. The
+ * application should make one \ref VdpVideoMixerRender call per pair of
+ * decoded fields, or per decoded frame.
+ *
+ * Weave de-interlacing requires no entries in the past/future lists.
+ *
+ * All implementations must support weave de-interlacing.
+ *
+ * \subsection deint_bob Bob De-interlacing
+ *
+ * Bob de-interlacing is the act of vertically scaling a single field to the
+ * size of a single frame.
+ *
+ * To achieve bob de-interlacing, simply provide a single field as
+ * \b video_surface_current, and set \b current_picture_structure
+ * appropriately, to indicate whether a top or bottom field was provided.
+ *
+ * Inverse telecine is disabled when using bob de-interlacing.
+ *
+ * Bob de-interlacing produces one output frame for each input field. The
+ * application should make one \ref VdpVideoMixerRender call per decoded
+ * field.
+ *
+ * Bob de-interlacing requires no entries in the past/future lists.
+ *
+ * Bob de-interlacing is the default when no advanced method is requested and
+ * enabled. Advanced de-interlacing algorithms may fall back to bob e.g. when
+ * required past/future fields are missing.
+ * 
+ * All implementations must support bob de-interlacing.
+ *
+ * \subsection deint_adv Advanced De-interlacing
+ *
+ * Operation of both temporal and temporal-spatial de-interlacing is
+ * identical; the only difference is the internal processing the algorithm
+ * performs in generating the output frame.
+ *
+ * These algorithms use various advanced processing on the pixels of both the
+ * current and various past/future fields in order to determine how best to
+ * de-interlacing individual portions of the image.
+ *
+ * Inverse telecine may be enabled when using advanced de-interlacing.
+ *
+ * Advanced de-interlacing produces one output frame for each input field. The
+ * application should make one \ref VdpVideoMixerRender call per decoded
+ * field.
+ *
+ * Advanced de-interlacing requires entries in the past/future lists.
+ *
+ * Availability of advanced de-interlacing algorithms is implementation
+ * dependent.
+ *
+ * \subsection deint_rate De-interlacing Rate
+ *
+ * For all de-interlacing algorithms except weave, a choice may be made to
+ * call \ref VdpVideoMixerRender for either each decoded field, or every
+ * second decoded field.
+ *
+ * If \ref VdpVideoMixerRender is called for every decoded field, the
+ * generated post-processed frame rate is equal to the decoded field rate.
+ * Put another way, the generated post-processed nominal field rate is equal
+ * to 2x the decoded field rate. This is standard practice.
+ *
+ * If \ref VdpVideoMixerRender is called for every second decoded field (say
+ * every top field), the generated post-processed frame rate is half to the
+ * decoded field rate. This mode of operation is thus referred to as
+ * "half-rate".
+ *
+ * Implementations may choose whether to support half-rate de-interlacing mode
+ * or not. Regular de-interlacing mode should be supported to any supported
+ * advanced de-interlacing algorithm.
+ *
+ * The descriptions of de-interlacing algorithms above assume that regular
+ * (not half-rate) operation is being performed, when detailing the number of
+  "half-rate" de-interlacing is used.deoMixerRender calls.
+ *
+ * Recall that the concatenation of past/current/future surface lists simply
+ * forms a window into the stream of decoded fields. To achieve standard
+ * de-interlacing, the window is slid through the list of decoded fields one
+ * field at a time, and a call is made to \ref VdpVideoMixerRender for each
+ * movement of the window. To achieve half-rate de-interlacing, the window is
+ * slid through the* list of decoded fields two fields at a time, and a
+ * call is made to \ref VdpVideoMixerRender for each movement of the window.
+ *
+ * \subsection invtc Inverse Telecine
+ *
+ * Assuming the implementation supports it, inverse telecine may be enabled
+ * alongside any advanced de-interlacing algorithm. Inverse telecine is never
+ * active for bob or weave.
+ *
+ * Operation of \ref VdpVideoMixerRender with inverse telecine active is
+ * identical to the basic operation mechanisms describe above in every way;
+ * all inverse telecine processing is performed internally to the
+ * \ref VdpVideoMixer "VdpVideoMixer".
+ *
+ * In particular, there is no provision way for \ref VdpVideoMixerRender to
+ * indicate when identical input fields have been observed, and consequently
+ * identical output frames may have been produced.
+ *
+ * De-interlacing (and inverse telecine) may be applied to streams that are
+ * marked as being progressive. This will allow detection of, and correct
+ * de-interlacing of, mixed interlace/progressive streams, bad edits, etc.
+ * To implement de-interlacing/inverse-telecine on progressive material,
+ * simply treat the stream of decoded frames as a stream of decoded fields,
+ * apply any telecine flags (see the next section), and then apply
+ * de-interlacing to those fields as described above.
+ *
+ * Implementations are free to determine whether inverse telecine operates
+ * in conjunction with half-rate de-interlacing or not. It should always
+ * operate with regular de-interlacing, when advertized.
+ *
+ * \subsection tcflags Telecine (Pull-Down) Flags
+ *
+ * Some media delivery formats, e.g. DVD-Video, include flags that are
+ * intended to modify the decoded field sequence before display. This allows
+ * e.g. 24p content to be encoded at 48i, which saves space relative to a 60i
+ * encoded stream, but still displayed at 60i, to match target consumer
+ * display equipment.
+ *
+ * If the inverse telecine option is not activated in the
+ * \ref VdpVideoMixer "VdpVideoMixer", these flags should be ignored, and the
+ * decoded fields passed directly to \ref VdpVideoMixerRender as detailed
+ * above.
+ *
+ * However, to make full use of the inverse telecine feature, these flags
+ * should be applied to the field stream, yielding another field stream with
+ * some repeated fields, before passing the field stream to
+ * \ref VdpVideoMixerRender. In this scenario, the sliding window mentioned
+ * in the descriptions above applies to the field stream after application of
+ * flags.
+ *
+ * \section extending Extending the API 
+ * 
+ * \subsection extend_enums Enumerations and Other Constants
+ * 
+ * VDPAU defines a number of enumeration types.
+ * 
+ * When modifying VDPAU, existing enumeration constants must
+ * continue to exist (although they may be deprecated), and do
+ * so in the existing order.
+ * 
+ * The above discussion naturally applies to "manually" defined 
+ * enumerations, using pre-processor macros, too. 
+ *  
+ * \subsection extend_structs Structures
+ * 
+ * In most case, VDPAU includes no provision for modifying existing
+ * structure definitions, although they may be deprecated.
+ * 
+ * New structures may be created, together with new API entry
+ * points or feature/attribute/parameter values, to expose new 
+ * functionality. 
+ *
+ * A few structures are considered plausible candidates for future extension.
+ * Such structures include a version number as the first field, indicating the
+ * exact layout of the client-provided data. Such structures may only be
+ * modified by adding new fields to the end of the structure, so that the
+ * original structure definition is completely compatible with a leading
+ * subset of fields of the extended structure.
+ * 
+ * \subsection extend_functions Functions
+ * 
+ * Existing functions may not be modified, although they may be
+ * deprecated.
+ * 
+ * New functions may be added at will. Note the enumeration
+ * requirements when modifying the enumeration that defines the
+ * list of entry points.
+ * 
+ * \section preemption_note Display Preemption 
+ *  
+ * Please note that the display may be preempted away from 
+ * VDPAU at any time. See \ref display_preemption for more 
+ * details. 
+ *
+ * \subsection trademarks Trademarks
+ *
+ * VDPAU is a trademark of NVIDIA Corporation. You may freely use the
+ * VDPAU trademark, as long as trademark ownership is attributed to
+ * NVIDIA Corporation.
+ */
+
+/**
+ * \file vdpau.h
+ * \brief The Core API
+ *
+ * This file contains the \ref api_core "Core API".
+ */
+
+#ifndef _VDPAU_H
+#define _VDPAU_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \defgroup api_core Core API
+ *
+ * The core API encompasses all VDPAU functionality that operates
+ * in the same fashion across all Window Systems.
+ *
+ * @{
+ */
+
+/**
+ * \defgroup base_types Basic Types
+ *  
+ * VDPAU primarily uses ISO C99 types from \c stdint.h.
+ *
+ * @{
+ */
+
+/** \brief A true \ref VdpBool value */
+#define VDP_TRUE 1
+/** \brief A false \ref VdpBool value */
+#define VDP_FALSE 0
+/** 
+ * \brief A boolean value, holding \ref VDP_TRUE or \ref 
+ * VDP_FALSE.
+ */
+typedef int VdpBool;
+
+/*@}*/
+
+/**
+ * \defgroup misc_types Miscellaneous Types
+ *
+ * @{
+ */
+
+/**
+ * \brief An invalid object handle value. 
+ *  
+ * This value may be used to represent an invalid, or 
+ * non-existent, object (\ref VdpDevice "VdpDevice", 
+ * \ref VdpVideoSurface "VdpVideoSurface", etc.) 
+ *  
+ * Note that most APIs require valid object handles in all 
+ * cases, and will fail when presented with this value. 
+ */
+#define VDP_INVALID_HANDLE 0xffffffffU
+
+/**
+ * \brief The set of all chroma formats for \ref VdpVideoSurface
+ * "VdpVideoSurface"s.
+ */
+typedef uint32_t VdpChromaType;
+
+/** \hideinitializer \brief 4:2:0 chroma format. */
+#define VDP_CHROMA_TYPE_420 (VdpChromaType)0
+/** \hideinitializer \brief 4:2:2 chroma format. */
+#define VDP_CHROMA_TYPE_422 (VdpChromaType)1
+/** \hideinitializer \brief 4:4:4 chroma format. */
+#define VDP_CHROMA_TYPE_444 (VdpChromaType)2
+
+/**
+ * \brief The set of all known YCbCr surface formats.
+ */
+typedef uint32_t VdpYCbCrFormat;
+
+/** 
+ * \hideinitializer 
+ * \brief The "NV12" YCbCr surface format. 
+ *  
+ * This format has a two planes, a Y plane and a UV plane. 
+ *  
+ * The Y plane is an array of byte-sized Y components. 
+ * Applications should access this data via a uint8_t pointer. 
+ *  
+ * The UV plane is an array of interleaved byte-sized U and V 
+ * components, in the order U, V, U, V. Applications should 
+ * access this data via a uint8_t pointer. 
+ */ 
+#define VDP_YCBCR_FORMAT_NV12     (VdpYCbCrFormat)0
+/** 
+ * \hideinitializer 
+ * \brief The "YV12" YCbCr surface format. 
+ *  
+ * This format has a three planes, a Y plane, a U plane, and a V
+ * plane. 
+ *  
+ * Each of the planes is an array of byte-sized components. 
+ *  
+ * Applications should access this data via a uint8_t pointer. 
+ */ 
+#define VDP_YCBCR_FORMAT_YV12     (VdpYCbCrFormat)1
+/** 
+ * \hideinitializer 
+ * \brief The "UYVY" YCbCr surface format. 
+ *  
+ * This format may also be known as Y422, UYNV, HDYC. 
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array of interleaved byte-sized Y, U, and V 
+ * components, in the order U, Y, V, Y, U, Y, V, Y. 
+ *  
+ * Applications should access this data via a uint8_t pointer.
+ */ 
+#define VDP_YCBCR_FORMAT_UYVY     (VdpYCbCrFormat)2
+/** 
+ * \hideinitializer 
+ * \brief The "YUYV" YCbCr surface format. 
+ *  
+ * This format may also be known as YUY2, YUNV, V422.
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array of interleaved byte-sized Y, U, and V 
+ * components, in the order Y, U, Y, V, Y, U, Y, V. 
+ *  
+ * Applications should access this data via a uint8_t pointer.
+ */ 
+#define VDP_YCBCR_FORMAT_YUYV     (VdpYCbCrFormat)3
+/** 
+ * \hideinitializer 
+ * \brief A packed YCbCr format.
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array packed 32-bit pixel data. Within each 
+ * 32-bit pixel, bits [31:24] contain A, bits [23:16] contain V, 
+ * bits [15:8] contain U, and bits [7:0] contain Y. 
+ *  
+ * Applications should access this data via a uint32_t pointer.
+ */ 
+#define VDP_YCBCR_FORMAT_Y8U8V8A8 (VdpYCbCrFormat)4
+/** 
+ * \hideinitializer 
+ * \brief A packed YCbCr format.
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array packed 32-bit pixel data. Within each 
+ * 32-bit pixel, bits [31:24] contain A, bits [23:16] contain Y,
+ * bits [15:8] contain U, and bits [7:0] contain V. 
+ *  
+ * Applications should access this data via a uint32_t pointer.
+ */ 
+#define VDP_YCBCR_FORMAT_V8U8Y8A8 (VdpYCbCrFormat)5
+
+/**
+ * \brief  The set of all known RGB surface formats.
+ */
+typedef uint32_t VdpRGBAFormat;
+
+/** 
+ * \hideinitializer 
+ * \brief A packed RGB format.
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array packed 32-bit pixel data. Within each 
+ * 32-bit pixel, bits [31:24] contain A, bits [23:16] contain R,
+ * bits [15:8] contain G, and bits [7:0] contain B. 
+ *  
+ * Applications should access this data via a uint32_t pointer.
+ */ 
+#define VDP_RGBA_FORMAT_B8G8R8A8    (VdpRGBAFormat)0
+/** 
+ * \hideinitializer 
+ * \brief A packed RGB format.
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array packed 32-bit pixel data. Within each 
+ * 32-bit pixel, bits [31:24] contain A, bits [23:16] contain B,
+ * bits [15:8] contain G, and bits [7:0] contain R. 
+ *  
+ * Applications should access this data via a uint32_t pointer.
+ */ 
+#define VDP_RGBA_FORMAT_R8G8B8A8    (VdpRGBAFormat)1
+/** 
+ * \hideinitializer 
+ * \brief A packed RGB format.
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array packed 32-bit pixel data. Within each 
+ * 32-bit pixel, bits [31:30] contain A, bits [29:20] contain B,
+ * bits [19:10] contain G, and bits [9:0] contain R. 
+ *  
+ * Applications should access this data via a uint32_t pointer. 
+ */ 
+#define VDP_RGBA_FORMAT_R10G10B10A2 (VdpRGBAFormat)2
+/** 
+ * \hideinitializer 
+ * \brief A packed RGB format.
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array packed 32-bit pixel data. Within each 
+ * 32-bit pixel, bits [31:30] contain A, bits [29:20] contain R,
+ * bits [19:10] contain G, and bits [9:0] contain B. 
+ *  
+ * Applications should access this data via a uint32_t pointer. 
+ */ 
+#define VDP_RGBA_FORMAT_B10G10R10A2 (VdpRGBAFormat)3
+/** 
+ * \hideinitializer 
+ * \brief An alpha-only surface format. 
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array of byte-sized components.
+ *  
+ * Applications should access this data via a uint8_t pointer. 
+ */ 
+#define VDP_RGBA_FORMAT_A8          (VdpRGBAFormat)4
+
+/**
+ * \brief  The set of all known indexed surface formats.
+ */
+typedef uint32_t VdpIndexedFormat;
+
+/** 
+ * \hideinitializer 
+ * \brief A 4-bit indexed format, with alpha. 
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array of byte-sized components. Within each 
+ * byte, bits [7:4] contain I (index), and bits [3:0] contain A.
+ *  
+ * Applications should access this data via a uint8_t pointer. 
+ */ 
+#define VDP_INDEXED_FORMAT_A4I4 (VdpIndexedFormat)0
+/** 
+ * \hideinitializer 
+ * \brief A 4-bit indexed format, with alpha. 
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array of byte-sized components. Within each 
+ * byte, bits [7:4] contain A, and bits [3:0] contain I (index). 
+ *  
+ * Applications should access this data via a uint8_t pointer. 
+ */ 
+#define VDP_INDEXED_FORMAT_I4A4 (VdpIndexedFormat)1
+/** 
+ * \hideinitializer 
+ * \brief A 8-bit indexed format, with alpha. 
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array of interleaved byte-sized A and I 
+ * (index) components, in the order A, I, A, I. 
+ *  
+ * Applications should access this data via a uint8_t pointer.
+ */ 
+#define VDP_INDEXED_FORMAT_A8I8 (VdpIndexedFormat)2
+/** 
+ * \hideinitializer 
+ * \brief A 8-bit indexed format, with alpha. 
+ *  
+ * This format has a single plane. 
+ *  
+ * This plane is an array of interleaved byte-sized A and I 
+ * (index) components, in the order I, A, I, A. 
+ *  
+ * Applications should access this data via a uint8_t pointer.
+ */ 
+#define VDP_INDEXED_FORMAT_I8A8 (VdpIndexedFormat)3
+
+/**
+ * \brief A location within a surface.
+ *
+ * The VDPAU co-ordinate system has its origin at the top-left
+ * of a surface, with x and y components increasing right and
+ * down.
+ */
+typedef struct {
+    /** X co-ordinate. */
+    uint32_t x;
+    /** Y co-ordinate. */
+    uint32_t y;
+} VdpPoint;
+
+/**
+ * \brief A rectangular region of a surface.
+ *
+ * The co-ordinates are top-left inclusive, bottom-right
+ * exclusive.
+ *
+ * The VDPAU co-ordinate system has its origin at the top-left
+ * of a surface, with x and y components increasing right and
+ * down.
+ */
+typedef struct {
+    /** Left X co-ordinate. Inclusive. */
+    uint32_t x0;
+    /** Top Y co-ordinate. Inclusive. */
+    uint32_t y0;
+    /** Right X co-ordinate. Exclusive. */
+    uint32_t x1;
+    /** Bottom Y co-ordinate. Exclusive. */
+    uint32_t y1;
+} VdpRect;
+
+/**
+ * A constant RGBA color.
+ *
+ * Note that the components are stored as float values in the
+ * range 0.0...1.0 rather than format-specific integer values.
+ * This allows VdpColor values to be independent from the exact
+ * surface format(s) in use.
+ */
+typedef struct {
+    float red;
+    float green;
+    float blue;
+    float alpha;
+} VdpColor;
+
+/*@}*/
+
+/**
+ * \defgroup error_handling Error Handling
+ *
+ * @{
+ */
+
+/**
+ * \hideinitializer 
+ * \brief The set of all possible error codes.
+ */
+typedef enum {
+    /** The operation completed successfully; no error. */
+    VDP_STATUS_OK = 0,
+    /**
+     * No backend implementation could be loaded.
+     */
+    VDP_STATUS_NO_IMPLEMENTATION,
+    /** 
+     * The display was preempted, or a fatal error occurred.
+     *
+     * The application must re-initialize VDPAU. 
+     */
+    VDP_STATUS_DISPLAY_PREEMPTED,
+    /**
+     * An invalid handle value was provided.
+     *
+     * Either the handle does not exist at all, or refers to an object of an
+     * incorrect type.
+     */
+    VDP_STATUS_INVALID_HANDLE,
+    /**
+     * An invalid pointer was provided.
+     *
+     * Typically, this means that a NULL pointer was provided for an "output"
+     * parameter.
+     */
+    VDP_STATUS_INVALID_POINTER,
+    /**
+     * An invalid/unsupported \ref VdpChromaType value was supplied.
+     */
+    VDP_STATUS_INVALID_CHROMA_TYPE,
+    /**
+     * An invalid/unsupported \ref VdpYCbCrFormat value was supplied.
+     */
+    VDP_STATUS_INVALID_Y_CB_CR_FORMAT,
+    /**
+     * An invalid/unsupported \ref VdpRGBAFormat value was supplied.
+     */
+    VDP_STATUS_INVALID_RGBA_FORMAT,
+    /**
+     * An invalid/unsupported \ref VdpIndexedFormat value was supplied.
+     */
+    VDP_STATUS_INVALID_INDEXED_FORMAT,
+    /**
+     * An invalid/unsupported \ref VdpColorStandard value was supplied.
+     */
+    VDP_STATUS_INVALID_COLOR_STANDARD,
+    /**
+     * An invalid/unsupported \ref VdpColorTableFormat value was supplied.
+     */
+    VDP_STATUS_INVALID_COLOR_TABLE_FORMAT,
+    /**
+     * An invalid/unsupported \ref VdpOutputSurfaceRenderBlendFactor value was
+     * supplied.
+     */
+    VDP_STATUS_INVALID_BLEND_FACTOR,
+    /**
+     * An invalid/unsupported \ref VdpOutputSurfaceRenderBlendEquation value
+     * was supplied.
+     */
+    VDP_STATUS_INVALID_BLEND_EQUATION,
+    /**
+     * An invalid/unsupported flag value/combination was supplied.
+     */
+    VDP_STATUS_INVALID_FLAG,
+    /**
+     * An invalid/unsupported \ref VdpDecoderProfile value was supplied.
+     */
+    VDP_STATUS_INVALID_DECODER_PROFILE,
+    /**
+     * An invalid/unsupported \ref VdpVideoMixerFeature value was supplied.
+     */
+    VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE,
+    /**
+     * An invalid/unsupported \ref VdpVideoMixerParameter value was supplied.
+     */
+    VDP_STATUS_INVALID_VIDEO_MIXER_PARAMETER,
+    /**
+     * An invalid/unsupported \ref VdpVideoMixerAttribute value was supplied.
+     */
+    VDP_STATUS_INVALID_VIDEO_MIXER_ATTRIBUTE,
+    /**
+     * An invalid/unsupported \ref VdpVideoMixerPictureStructure value was
+     * supplied.
+     */
+    VDP_STATUS_INVALID_VIDEO_MIXER_PICTURE_STRUCTURE,
+    /**
+     * An invalid/unsupported \ref VdpFuncId value was supplied.
+     */
+    VDP_STATUS_INVALID_FUNC_ID,
+    /**
+     * The size of a supplied object does not match the object it is being
+     * used with.
+     *
+     * For example, a \ref VdpVideoMixer "VdpVideoMixer" is configured to
+     * process \ref VdpVideoSurface "VdpVideoSurface" objects of a specific
+     * size. If presented with a \ref VdpVideoSurface "VdpVideoSurface" of a
+     * different size, this error will be raised.
+     */
+    VDP_STATUS_INVALID_SIZE,
+    /**
+     * An invalid/unsupported value was supplied.
+     *
+     * This is a catch-all error code for values of type other than those
+     * with a specific error code.
+     */
+    VDP_STATUS_INVALID_VALUE,
+    /**
+     * An invalid/unsupported structure version was specified in a versioned
+     * structure. This implies that the implementation is older than the
+     * header file the application was built against.
+     */
+    VDP_STATUS_INVALID_STRUCT_VERSION,
+    /**
+     * The system does not have enough resources to complete the requested
+     * operation at this time.
+     */
+    VDP_STATUS_RESOURCES,
+    /**
+     * The set of handles supplied are not all related to the same VdpDevice.
+     *
+     * When performing operations that operate on multiple surfaces, such as
+     * \ref  VdpOutputSurfaceRenderOutputSurface or \ref VdpVideoMixerRender,
+     * all supplied surfaces must have been created within the context of the
+     * same \ref VdpDevice "VdpDevice" object. This error is raised if they were
+     * not.
+     */
+    VDP_STATUS_HANDLE_DEVICE_MISMATCH,
+    /**
+     * A catch-all error, used when no other error code applies.
+     */
+    VDP_STATUS_ERROR,
+} VdpStatus;
+
+/**
+ * \brief Retrieve a string describing an error code.
+ * \param[in] status The error code.
+ * \return A pointer to the string. Note that this is a 
+ *       statically allocated read-only string. As such, the
+ *       application must not free the returned pointer. The
+ *       pointer is valid as long as the VDPAU implementation is
+ *       present within the application's address space.
+ */
+typedef char const * VdpGetErrorString(
+    VdpStatus status
+);
+
+/*@}*/
+
+/** 
+ * \defgroup versioning Versioning 
+ *  
+ *  
+ * @{ 
+ */ 
+
+/** 
+ * \brief The VDPAU version described by this header file. 
+ *  
+ * Note that VDPAU version numbers are simple integers that 
+ * increase monotonically (typically by value 1) with each VDPAU 
+ * header revision. 
+ */
+#define VDPAU_VERSION 0
+
+/**
+ * \brief Retrieve the VDPAU version implemented by the backend. 
+ * \param[out] api_version The API version.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpGetApiVersion(
+    /* output parameters follow */
+    uint32_t * api_version
+);
+
+/**
+ * \brief Retrieve an implementation-specific string description 
+ *        of the implementation. This typically includes detailed version
+ *        information.
+ * \param[out] information_string A pointer to the information
+ *       string. Note that this is a statically allocated
+ *       read-only string. As such, the application must not
+ *       free the returned pointer. The pointer is valid as long
+ *       as the implementation is present within the
+ *       application's address space.
+ * \return VdpStatus The completion status of the operation. 
+ *  
+ * Note that the returned string is useful for information 
+ * reporting. It is not intended that the application should 
+ * parse this string in order to determine any information about 
+ * the implementation. 
+ */
+typedef VdpStatus VdpGetInformationString(
+    /* output parameters follow */
+    char const * * information_string
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpDevice VdpDevice; Primary API object
+ *
+ * The VdpDevice is the root of the VDPAU object system. Using a
+ * VdpDevice object, all other object types may be created. See
+ * the sections describing those other object types for details
+ * on object creation.
+ *
+ * Note that VdpDevice objects are created using the \ref
+ * api_winsys.
+ *
+ * @{
+ */
+
+/**
+ * \brief  An opaque handle representing a VdpDevice object.
+ */
+typedef uint32_t VdpDevice;
+
+/**
+ * \brief Destroy a VdpDevice.
+ * \param[in] device The device to destroy.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpDeviceDestroy(
+    VdpDevice device
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpCSCMatrix VdpCSCMatrix; CSC Matrix Manipulation
+ *
+ * When converting from YCbCr to RGB data formats, a color space
+ * conversion operation must be performed. This operation is 
+ * parameterized using a "color space conversion matrix". The 
+ * VdpCSCMatrix is a data structure representing this
+ * information.
+ *
+ * @{
+ */
+
+/**
+ * \brief Storage for a color space conversion matrix.
+ *
+ * Note that the application may choose to construct the matrix
+ * content by either:
+ * - Directly filling in the fields of the CSC matrix
+ * - Using the \ref VdpGenerateCSCMatrix helper function.
+ *
+ * The color space conversion equation is as follows:
+ *
+ * \f[
+ * \left( \begin{array}{c} R \\ G \\ B \end{array} \right)
+ * =
+ * \left( \begin{array}{cccc}
+ * m_{0,0} & m_{0,1} & m_{0,2} & m_{0,3} \\
+ * m_{1,0} & m_{1,1} & m_{1,2} & m_{1,3} \\
+ * m_{2,0} & m_{2,1} & m_{2,2} & m_{2,3}
+ * \end{array}
+ * \right)
+ * *
+ * \left( \begin{array}{c} Y \\ Cb \\ Cr \\ 1.0 \end{array}
+ *      \right)
+ * \f]
+ */
+typedef float VdpCSCMatrix[3][4];
+
+#define VDP_PROCAMP_VERSION 0
+
+/**
+ * \brief Procamp operation parameterization data.
+ *
+ * When performing a color space conversion operation, various
+ * adjustments can be performed at the same time, such as
+ * brightness and contrast. This structure defines the level of
+ * adjustments to make.
+ */
+typedef struct {
+    /**
+     * This field must be filled with VDP_PROCAMP_VERSION
+     */
+    uint32_t struct_version;
+    /**
+     * Brightness adjustment amount. A value clamped between
+     * -1.0 and 1.0. 0.0 represents no modification.
+     */
+    float brightness;
+    /**
+     * Contrast adjustment amount. A value clamped between
+     * 0.0 and 10.0. 1.0 represents no modification.
+     */
+    float contrast;
+    /**
+     * Saturation adjustment amount. A value clamped between 0.0 and
+     * 10.0. 1.0 represents no modification. 
+     */
+    float saturation;
+    /**
+     * Hue adjustment amount. A value clamped between
+     * -PI and PI. 0.0 represents no modification.
+     */
+    float hue;
+} VdpProcamp;
+
+/**
+ * \brief YCbCr color space specification.
+ *
+ * A number of YCbCr color spaces exist. This enumeration
+ * defines the specifications known to VDPAU.
+ */
+typedef uint32_t VdpColorStandard;
+
+/** \hideinitializer \brief ITU-R BT.601 */
+#define VDP_COLOR_STANDARD_ITUR_BT_601 (VdpColorStandard)0
+/** \hideinitializer \brief ITU-R BT.709 */
+#define VDP_COLOR_STANDARD_ITUR_BT_709 (VdpColorStandard)1
+/** \hideinitializer \brief SMPTE-240M */
+#define VDP_COLOR_STANDARD_SMPTE_240M  (VdpColorStandard)2
+
+/**
+ * \brief Generate a color space conversion matrix
+ * \param[in] procamp The procamp adjustments to make. If NULL,
+ *        no adjustments will be made.
+ * \param[in] standard The YCbCr color space to convert from.
+ * \param[out] csc_matrix The CSC matrix to initialize.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpGenerateCSCMatrix(
+    VdpProcamp *     procamp,
+    VdpColorStandard standard,
+    /* output parameters follow */
+    VdpCSCMatrix *   csc_matrix
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpVideoSurface VdpVideoSurface; Video Surface object
+ *
+ * A VdpVideoSurface stores YCbCr data in an internal format,
+ * with a variety of possible chroma sub-sampling options. 
+ *
+ * A VdpVideoSurface may be filled with:
+ * - Data provided by the CPU via \ref
+ *   VdpVideoSurfacePutBitsYCbCr (i.e. software decode.)
+ * - The result of applying a \ref VdpDecoder "VdpDecoder" to
+ *   compressed video data.
+ *
+ * VdpVideoSurface content may be accessed by:
+ * - The application via \ref VdpVideoSurfaceGetBitsYCbCr
+ * - The Hardware that implements \ref VdpOutputSurface
+ *   "VdpOutputSurface" \ref VdpOutputSurfaceRender
+ *   "rendering functionality".
+ * - The Hardware the implements \ref VdpVideoMixer
+ *   "VdpVideoMixer" functionality.
+ *
+ * VdpVideoSurfaces are not directly displayable. They must be
+ * converted into a displayable format using \ref VdpVideoMixer
+ * "VdpVideoMixer" objects.
+ *
+ * See \ref video_mixer_usage for additional information.
+ *
+ * @{
+ */
+
+/**
+ * \brief Query the implementation's VdpVideoSurface
+ *        capabilities.
+ * \param[in] device The device to query.
+ * \param[in] surface_chroma_type The type of chroma type for
+ *       which information is requested.
+ * \param[out] is_supported Is this chroma type supported?
+ * \param[out] max_width The maximum supported surface width for
+ *       this chroma type.
+ * \param[out] max_height The maximum supported surface height
+ *       for this chroma type.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoSurfaceQueryCapabilities(
+    VdpDevice     device,
+    VdpChromaType surface_chroma_type,
+    /* output parameters follow */
+    VdpBool *     is_supported,
+    uint32_t *    max_width,
+    uint32_t *    max_height
+);
+
+/**
+ * \brief Query the implementation's VdpVideoSurface
+ *        GetBits/PutBits capabilities.
+ * \param[in] device The device to query.
+ * \param[in] surface_chroma_type The type of chroma type for
+ *       which information is requested.
+ * \param[in] bits_ycbcr_format The format of application "bits"
+ *       buffer for which information is requested.
+ * \param[out] is_supported Is this chroma type supported?
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoSurfaceQueryGetPutBitsYCbCrCapabilities(
+    VdpDevice      device,
+    VdpChromaType  surface_chroma_type,
+    VdpYCbCrFormat bits_ycbcr_format,
+    /* output parameters follow */
+    VdpBool *      is_supported
+);
+
+/**
+ * \brief An opaque handle representing a VdpVideoSurface
+ *        object.
+ */
+typedef uint32_t VdpVideoSurface;
+
+/**
+ * \brief Create a VdpVideoSurface.
+ * \param[in] device The device that will contain the surface.
+ * \param[in] chroma_type The chroma type of the new surface.
+ * \param[in] width The width of the new surface.
+ * \param[in] height The height of the new surface.
+ * \param[out] surface The new surface's handle.
+ * \return VdpStatus The completion status of the operation. 
+ *  
+ * The memory backing the surface may not be initialized during
+ * creation. Applications are expected to initialize any region 
+ * that they use, via \ref VdpDecoderRender or \ref 
+ * VdpVideoSurfacePutBitsYCbCr. 
+ */
+typedef VdpStatus VdpVideoSurfaceCreate(
+    VdpDevice         device,
+    VdpChromaType     chroma_type,
+    uint32_t          width,
+    uint32_t          height,
+    /* output parameters follow */
+    VdpVideoSurface * surface
+);
+
+/**
+ * \brief Destroy a VdpVideoSurface.
+ * \param[in] surface The surface's handle.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoSurfaceDestroy(
+    VdpVideoSurface surface
+);
+
+/**
+ * \brief Retrieve the parameters used to create a
+ *        VdpVideoSurface.
+ * \param[in] surface The surface's handle.
+ * \param[out] chroma_type The chroma type of the surface.
+ * \param[out] width The width of the surface.
+ * \param[out] height The height of the surface.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoSurfaceGetParameters(
+    VdpVideoSurface surface,
+    /* output parameters follow */
+    VdpChromaType * chroma_type,
+    uint32_t *      width,
+    uint32_t *      height
+);
+
+/**
+ * \brief Copy image data from a VdpVideoSurface to application
+ *        memory in a specified YCbCr format.
+ * \param[in] surface The surface's handle.
+ * \param[in] destination_ycbcr_format The format of the
+ *       application's data buffers.
+ * \param[in] destination_data Pointers to the application data
+ *       buffers into which the image data will be written. Note
+ *       that this is an array of pointers, one per plane. The
+ *       destination_format parameter will define how many
+ *       planes are required.
+ * \param[in] destination_pitches Pointers to the pitch values
+ *       for the application data buffers. Note that this is an
+ *       array of pointers, one per plane. The
+ *       destination_format parameter will define how many
+ *       planes are required.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoSurfaceGetBitsYCbCr(
+    VdpVideoSurface  surface,
+    VdpYCbCrFormat   destination_ycbcr_format,
+    void * const *   destination_data,
+    uint32_t const * destination_pitches
+);
+
+/**
+ * \brief Copy image data from application memory in a specific
+ *        YCbCr format to a VdpVideoSurface.
+ * \param[in] surface The surface's handle.
+ * \param[in] source_ycbcr_format The format of the
+ *       application's data buffers.
+ * \param[in] source_data Pointers to the application data
+ *       buffers from which the image data will be copied. Note
+ *       that this is an array of pointers, one per plane. The
+ *       source_format parameter will define how many
+ *       planes are required.
+ * \param[in] source_pitches Pointers to the pitch values
+ *       for the application data buffers. Note that this is an
+ *       array of pointers, one per plane. The
+ *       source_format parameter will define how many
+ *       planes are required.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoSurfacePutBitsYCbCr(
+    VdpVideoSurface      surface,
+    VdpYCbCrFormat       source_ycbcr_format,
+    void const * const * source_data,
+    uint32_t const *     source_pitches
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpOutputSurface VdpOutputSurface; Output Surface \
+ * object
+ *
+ * A VdpOutputSurface stores RGBA data in a defined format. 
+ *
+ * A VdpOutputSurface may be filled with:
+ * - Data provided by the CPU via the various
+ *   VdpOutputSurfacePutBits functions.
+ * - Using the VdpOutputSurface \ref VdpOutputSurfaceRender
+ *   "rendering functionality".
+ * - Using a \ref VdpVideoMixer "VdpVideoMixer" object.
+ *
+ * VdpOutputSurface content may be accessed by:
+ * - The application via the various VdpOutputSurfaceGetBits
+ *   functions.
+ * - The Hardware that implements VdpOutputSurface
+ *   \ref VdpOutputSurfaceRender "rendering functionality".
+ * - The Hardware the implements \ref VdpVideoMixer
+ *   "VdpVideoMixer" functionality.
+ * - The Hardware that implements \ref VdpPresentationQueue
+ *   "VdpPresentationQueue" functionality,
+ *
+ * VdpVideoSurfaces are directly displayable using a \ref
+ * VdpPresentationQueue "VdpPresentationQueue" object.
+ *
+ * @{
+ */
+
+/**
+ * \brief The set of all known color table formats, for use with 
+ * \ref VdpOutputSurfacePutBitsIndexed.
+ */
+typedef uint32_t VdpColorTableFormat;
+
+/** 
+ * \hideinitializer 
+ * \brief 8-bit per component packed into 32-bits 
+ *  
+ * This format is an array of packed 32-bit RGB color values. 
+ * Bits [31:24] are unused, bits [23:16] contain R, bits [15:8] 
+ * contain G, and bits [7:0] contain B. Note: The format is 
+ * physically an array of uint32_t values, and should be accessed 
+ * as such by the application in order to avoid endianness 
+ * issues. 
+ */ 
+#define VDP_COLOR_TABLE_FORMAT_B8G8R8X8 (VdpColorTableFormat)0
+
+/**
+ * \brief Query the implementation's VdpOutputSurface
+ *        capabilities.
+ * \param[in] device The device to query.
+ * \param[in] surface_rgba_format The surface format for
+ *       which information is requested.
+ * \param[out] is_supported Is this surface format supported?
+ * \param[out] max_width The maximum supported surface width for
+ *       this chroma type.
+ * \param[out] max_height The maximum supported surface height
+ *       for this chroma type.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfaceQueryCapabilities(
+    VdpDevice     device,
+    VdpRGBAFormat surface_rgba_format,
+    /* output parameters follow */
+    VdpBool *     is_supported,
+    uint32_t *    max_width,
+    uint32_t *    max_height
+);
+
+/**
+ * \brief Query the implementation's capability to perform a
+ *        PutBits operation using application data matching the
+ *        surface's format.
+ * \param[in] device The device to query.
+ * \param[in] surface_rgba_format The surface format for
+ *       which information is requested.
+ * \param[out] is_supported Is this surface format supported?
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfaceQueryGetPutBitsNativeCapabilities(
+    VdpDevice     device,
+    VdpRGBAFormat surface_rgba_format,
+    /* output parameters follow */
+    VdpBool *     is_supported
+);
+
+/**
+ * \brief Query the implementation's capability to perform a
+ *        PutBits operation using application data in a specific
+ *        indexed format.
+ * \param[in] device The device to query.
+ * \param[in] surface_rgba_format The surface format for
+ *       which information is requested.
+ * \param[in] bits_indexed_format The format of the application
+ *       data buffer.
+ * \param[in] color_table_format The format of the color lookup 
+ *       table.
+ * \param[out] is_supported Is this surface format supported?
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfaceQueryPutBitsIndexedCapabilities(
+    VdpDevice           device,
+    VdpRGBAFormat       surface_rgba_format,
+    VdpIndexedFormat    bits_indexed_format,
+    VdpColorTableFormat color_table_format,
+    /* output parameters follow */
+    VdpBool *           is_supported
+);
+
+/**
+ * \brief Query the implementation's capability to perform a
+ *        PutBits operation using application data in a specific
+ *        YCbCr/YUB format.
+ * \param[in] device The device to query.
+ * \param[in] surface_rgba_format The surface format for which
+ *       information is requested.
+ * \param[in] bits_ycbcr_format The format of the application
+ *       data buffer.
+ * \param[out] is_supported Is this surface format supported?
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfaceQueryPutBitsYCbCrCapabilities(
+    VdpDevice      device,
+    VdpRGBAFormat  surface_rgba_format,
+    VdpYCbCrFormat bits_ycbcr_format,
+    /* output parameters follow */
+    VdpBool *      is_supported
+);
+
+/**
+ * \brief An opaque handle representing a VdpOutputSurface
+ *        object.
+ */
+typedef uint32_t VdpOutputSurface;
+
+/**
+ * \brief Create a VdpOutputSurface.
+ * \param[in] device The device that will contain the surface.
+ * \param[in] rgba_format The format of the new surface.
+ * \param[in] width The width of the new surface.
+ * \param[in] height The height of the new surface.
+ * \param[out] surface The new surface's handle.
+ * \return VdpStatus The completion status of the operation. 
+ *  
+ * The memory backing the surface will be initialized to 0 color
+ * and 0 alpha (i.e. black.)
+ */
+typedef VdpStatus VdpOutputSurfaceCreate(
+    VdpDevice          device,
+    VdpRGBAFormat      rgba_format,
+    uint32_t           width,
+    uint32_t           height,
+    /* output parameters follow */
+    VdpOutputSurface * surface
+);
+
+/**
+ * \brief Destroy a VdpOutputSurface.
+ * \param[in] surface The surface's handle.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfaceDestroy(
+    VdpOutputSurface surface
+);
+
+/**
+ * \brief Retrieve the parameters used to create a
+ *        VdpOutputSurface.
+ * \param[in] surface The surface's handle.
+ * \param[out] rgba_format The format of the surface.
+ * \param[out] width The width of the surface.
+ * \param[out] height The height of the surface.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfaceGetParameters(
+    VdpOutputSurface surface,
+    /* output parameters follow */
+    VdpRGBAFormat *  rgba_format,
+    uint32_t *       width,
+    uint32_t *       height
+);
+
+/**
+ * \brief Copy image data from a VdpOutputSurface to application
+ *        memory in the surface's native format.
+ * \param[in] surface The surface's handle.
+ * \param[in] source_rect The sub-rectangle of the source
+ *       surface to copy. If NULL, the entire surface will be
+ *       retrieved.
+ * \param[in] destination_data Pointers to the application data
+ *       buffers into which the image data will be written. Note
+ *       that this is an array of pointers, one per plane. The
+ *       destination_format parameter will define how many
+ *       planes are required.
+ * \param[in] destination_pitches Pointers to the pitch values
+ *       for the application data buffers. Note that this is an
+ *       array of pointers, one per plane. The
+ *       destination_format parameter will define how many
+ *       planes are required.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfaceGetBitsNative(
+    VdpOutputSurface surface,
+    VdpRect const *  source_rect,
+    void * const *   destination_data,
+    uint32_t const * destination_pitches
+);
+
+/**
+ * \brief Copy image data from application memory in the
+ *        surface's native format to a VdpOutputSurface.
+ * \param[in] surface The surface's handle.
+ * \param[in] source_data Pointers to the application data
+ *       buffers from which the image data will be copied. Note
+ *       that this is an array of pointers, one per plane. The
+ *       source_format parameter will define how many
+ *       planes are required.
+ * \param[in] source_pitches Pointers to the pitch values
+ *       for the application data buffers. Note that this is an
+ *       array of pointers, one per plane. The
+ *       source_format parameter will define how many
+ *       planes are required.
+ * \param[in] destination_rect The sub-rectangle of the surface
+ *       to fill with application data. If NULL, the entire
+ *       surface will be updated.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfacePutBitsNative(
+    VdpOutputSurface     surface,
+    void const * const * source_data,
+    uint32_t const *     source_pitches,
+    VdpRect const *      destination_rect
+);
+
+/**
+ * \brief Copy image data from application memory in a specific
+ *        indexed format to a VdpOutputSurface.
+ * \param[in] surface The surface's handle.
+ * \param[in] source_indexed_format The format of the
+ *       application's data buffers.
+ * \param[in] source_data Pointers to the application data
+ *       buffers from which the image data will be copied. Note
+ *       that this is an array of pointers, one per plane. The
+ *       source_indexed_format parameter will define how many
+ *       planes are required.
+ * \param[in] source_pitches Pointers to the pitch values
+ *       for the application data buffers. Note that this is an
+ *       array of pointers, one per plane. The
+ *       source_indexed_format parameter will define how many
+ *       planes are required.
+ * \param[in] destination_rect The sub-rectangle of the surface
+ *       to fill with application data. If NULL, the entire
+ *       surface will be updated.
+ * \param[in] color_table_format The format of the color_table. 
+ * \param[in] color_table A table that maps between source index
+ *       and target color data. See \ref VdpColorTableFormat for
+ *       details regarding the memory layout. 
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfacePutBitsIndexed(
+    VdpOutputSurface     surface,
+    VdpIndexedFormat     source_indexed_format,
+    void const * const * source_data,
+    uint32_t const *     source_pitch,
+    VdpRect const *      destination_rect,
+    VdpColorTableFormat  color_table_format,
+    void const *         color_table
+);
+
+/**
+ * \brief Copy image data from application memory in a specific
+ *        YCbCr format to a VdpOutputSurface.
+ * \param[in] surface The surface's handle.
+ * \param[in] source_ycbcr_format The format of the
+ *       application's data buffers.
+ * \param[in] source_data Pointers to the application data
+ *       buffers from which the image data will be copied. Note
+ *       that this is an array of pointers, one per plane. The
+ *       source_ycbcr_format parameter will define how many
+ *       planes are required.
+ * \param[in] source_pitches Pointers to the pitch values
+ *       for the application data buffers. Note that this is an
+ *       array of pointers, one per plane. The
+ *       source_ycbcr_format parameter will define how many
+ *       planes are required.
+ * \param[in] destination_rect The sub-rectangle of the surface
+ *       to fill with application data. If NULL, the entire
+ *       surface will be updated.
+ * \param[in] csc_matrix The color space conversion matrix used
+ *       by the copy operation. If NULL, a default matrix will
+ *       be used internally. Th default matrix is equivalent to
+ *       ITU-R BT.601 with no procamp changes.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpOutputSurfacePutBitsYCbCr(
+    VdpOutputSurface     surface,
+    VdpYCbCrFormat       source_ycbcr_format,
+    void const * const * source_data,
+    uint32_t const *     source_pitches,
+    VdpRect const *      destination_rect,
+    VdpCSCMatrix const * csc_matrix
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpBitmapSurface VdpBitmapSurface; Bitmap Surface \
+ * object
+ *
+ * A VdpBitmapSurface stores RGBA data in a defined format.
+ *
+ * A VdpBitmapSurface may be filled with:
+ * - Data provided by the CPU via the \ref
+ *   VdpBitmapSurfacePutBitsNative function.
+ *
+ * VdpBitmapSurface content may be accessed by:
+ * - The Hardware that implements \ref VdpOutputSurface
+ *   "VdpOutputSurface" \ref VdpOutputSurfaceRender
+ *   "rendering functionality"
+ *
+ * VdpBitmapSurface objects are intended to store static read-only data, such
+ * as font glyphs, and the bitmaps used to compose an applications'
+ * user-interface.
+ *
+ * The primary differences between VdpBitmapSurfaces and
+ * \ref VdpOutputSurface "VdpOutputSurface"s are:
+ *
+ * - You cannot render to a VdpBitmapSurface, just upload native data via
+ *   the PutBits API.
+ *
+ * - The read-only nature of a VdpBitmapSurface gives the implementation more
+ *   flexibility in its choice of data storage location for the bitmap data.
+ *   For example, some implementations may choose to store some/all
+ *   VdpBitmapSurface objects in system memory to relieve GPU memory pressure.
+ *
+ * - VdpBitmapSurface and VdpOutputSurface may support different subsets of all
+ *   known RGBA formats.
+ *
+ * @{
+ */
+
+/**
+ * \brief Query the implementation's VdpBitmapSurface
+ *        capabilities.
+ * \param[in] device The device to query.
+ * \param[in] surface_rgba_format The surface format for
+ *       which information is requested.
+ * \param[out] is_supported Is this surface format supported?
+ * \param[out] max_width The maximum supported surface width for
+ *       this chroma type.
+ * \param[out] max_height The maximum supported surface height
+ *       for this chroma type.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpBitmapSurfaceQueryCapabilities(
+    VdpDevice     device,
+    VdpRGBAFormat surface_rgba_format,
+    /* output parameters follow */
+    VdpBool *     is_supported,
+    uint32_t *    max_width,
+    uint32_t *    max_height
+);
+
+/**
+ * \brief An opaque handle representing a VdpBitmapSurface
+ *        object.
+ */
+typedef uint32_t VdpBitmapSurface;
+
+/**
+ * \brief Create a VdpBitmapSurface.
+ * \param[in] device The device that will contain the surface.
+ * \param[in] rgba_format The format of the new surface.
+ * \param[in] width The width of the new surface.
+ * \param[in] height The height of the new surface.
+ * \param[in] frequently_accessed Is this bitmap used
+ *       frequently, or infrequently, by compositing options?
+ *       Implementations may use this as a hint to determine how
+ *       to allocate the underlying storage for the surface.
+ * \param[out] surface The new surface's handle.
+ * \return VdpStatus The completion status of the operation. 
+ *  
+ * The memory backing the surface may not be initialized 
+ * during creation. Applications are expected initialize any 
+ * region that they use, via \ref VdpBitmapSurfacePutBitsNative.
+ */
+typedef VdpStatus VdpBitmapSurfaceCreate(
+    VdpDevice          device,
+    VdpRGBAFormat      rgba_format,
+    uint32_t           width,
+    uint32_t           height,
+    VdpBool            frequently_accessed,
+    /* output parameters follow */
+    VdpBitmapSurface * surface
+);
+
+/**
+ * \brief Destroy a VdpBitmapSurface.
+ * \param[in] surface The surface's handle.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpBitmapSurfaceDestroy(
+    VdpBitmapSurface surface
+);
+
+/**
+ * \brief Retrieve the parameters used to create a
+ *        VdpBitmapSurface.
+ * \param[in] surface The surface's handle.
+ * \param[out] rgba_format The format of the surface.
+ * \param[out] width The width of the surface.
+ * \param[out] height The height of the surface.
+ * \param[out] frequently_accessed The frequently_accessed state
+ *       of the surface.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpBitmapSurfaceGetParameters(
+    VdpBitmapSurface surface,
+    /* output parameters follow */
+    VdpRGBAFormat *  rgba_format,
+    uint32_t *       width,
+    uint32_t *       height,
+    VdpBool *        frequently_accessed
+);
+
+/**
+ * \brief Copy image data from application memory in the
+ *        surface's native format to a VdpBitmapSurface.
+ * \param[in] surface The surface's handle.
+ * \param[in] source_data Pointers to the application data
+ *       buffers from which the image data will be copied. Note
+ *       that this is an array of pointers, one per plane. The
+ *       source_format parameter will define how many
+ *       planes are required.
+ * \param[in] source_pitches Pointers to the pitch values
+ *       for the application data buffers. Note that this is an
+ *       array of pointers, one per plane. The
+ *       source_format parameter will define how many
+ *       planes are required.
+ * \param[in] destination_rect The sub-rectangle of the surface
+ *       to fill with application data. If NULL, the entire
+ *       surface will be updated.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpBitmapSurfacePutBitsNative(
+    VdpBitmapSurface     surface,
+    void const * const * source_data,
+    uint32_t const *     source_pitches,
+    VdpRect const *      destination_rect
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpOutputSurfaceRender VdpOutputSurface Rendering \
+ *           Functionality
+ *
+ * \ref VdpOutputSurface "VdpOutputSurface" objects
+ * directly provide some rendering/compositing operations. These
+ * are described below.
+ *
+ * @{
+ */
+
+/** 
+ * \hideinitializer 
+ * \brief The blending equation factors.
+ */ 
+typedef enum {
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ZERO                     = 0,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE                      = 1,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_SRC_COLOR                = 2,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_SRC_COLOR      = 3,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_SRC_ALPHA                = 4,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA      = 5,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_DST_ALPHA                = 6,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_DST_ALPHA      = 7,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_DST_COLOR                = 8,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_DST_COLOR      = 9,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_SRC_ALPHA_SATURATE       = 10,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_CONSTANT_COLOR           = 11,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR = 12,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_CONSTANT_ALPHA           = 13,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA = 14,
+} VdpOutputSurfaceRenderBlendFactor;
+
+/** 
+ * \hideinitializer 
+ * \brief The blending equations.
+ */ 
+typedef enum {
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_SUBTRACT         = 0,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_REVERSE_SUBTRACT = 1,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_ADD              = 2,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_MIN              = 3,
+    VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_MAX              = 4,
+} VdpOutputSurfaceRenderBlendEquation;
+
+#define VDP_OUTPUT_SURFACE_RENDER_BLEND_STATE_VERSION 0
+
+/**
+ * \brief Complete blending operation definition.
+ */
+typedef struct {
+    /**
+     * This field must be filled with VDP_OUTPUT_SURFACE_RENDER_BLEND_STATE_VERSIION
+     */
+    uint32_t struct_version;
+    VdpOutputSurfaceRenderBlendFactor   blend_factor_source_color;
+    VdpOutputSurfaceRenderBlendFactor   blend_factor_destination_color;
+    VdpOutputSurfaceRenderBlendFactor   blend_factor_source_alpha;
+    VdpOutputSurfaceRenderBlendFactor   blend_factor_destination_alpha;
+    VdpOutputSurfaceRenderBlendEquation blend_equation_color;
+    VdpOutputSurfaceRenderBlendEquation blend_equation_alpha;
+    VdpColor                            blend_constant;
+} VdpOutputSurfaceRenderBlendState;
+
+/** 
+ * \hideinitializer 
+ * \brief Do not rotate source_surface prior to compositing.
+ */
+#define VDP_OUTPUT_SURFACE_RENDER_ROTATE_0   0
+
+/**
+ * \hideinitializer 
+ * \brief Rotate source_surface 90 degrees clockwise prior to
+ *        compositing.
+ */
+#define VDP_OUTPUT_SURFACE_RENDER_ROTATE_90  1
+
+/**
+ * \hideinitializer 
+ * \brief Rotate source_surface 180 degrees prior to
+ *        compositing.
+ */
+#define VDP_OUTPUT_SURFACE_RENDER_ROTATE_180 2
+
+/**
+ * \hideinitializer 
+ * \brief Rotate source_surface 270 degrees clockwise prior to
+ *        compositing.
+ */
+#define VDP_OUTPUT_SURFACE_RENDER_ROTATE_270 3
+
+/**
+ * \hideinitializer 
+ * \brief A separate color is used for each vertex of the
+ *        smooth-shaded quad. Hence, colors array contains 4
+ *        elements rather than 1. See description of colors
+ *        array.
+ */
+#define VDP_OUTPUT_SURFACE_RENDER_COLOR_PER_VERTEX (1 << 2)
+
+/**
+ * \brief Composite a sub-rectangle of a \ref VdpOutputSurface
+ *        "VdpOutputSurface" into a sub-rectangle of another
+ *        \ref VdpOutputSurface VdpOutputSurface.
+ * \param[in] destination_surface The destination surface of the
+ *       compositing operation.
+ * \param[in] destination_rect The sub-rectangle of the
+ *       destination surface to update. If NULL, the entire
+ *       destination surface will be updated.
+ * \param[in] source_surface The source surface for the
+ *       compositing operation. The surface is treated as having
+ *       four components: red, green, blue and alpha. Any
+ *       missing components are treated as 1.0. For example, for
+ *       an A8 VdpOutputSurface, alpha will come from the surface
+ *       but red, green and blue will be treated as 1.0. If
+ *       source_surface is NULL, all components will be treated
+ *       as 1.0. Note that destination_surface and
+ *       source_surface must have been allocated via the same
+ *       \ref VdpDevice "VdpDevice".
+ * \param[in] source_rect The sub-rectangle of the source
+ *       surface to read from. If NULL, the entire
+ *       source_surface will be read. Left/right ot top/bottom
+ *       co-ordinates may be swapped to flip the source. Any
+ *       flip occurs prior to any requested rotation. Values
+ *       from outside the source surface are valid and samples
+ *       at those locations will be taken from the nearest edge.
+ * \param[in] colors A pointer to an array of \ref VdpColor
+ *      "VdpColor" objects. If the flag
+ *      VDP_OUTPUT_SURFACE_RENDER_COLOR_PER_VERTEX is set,
+ *      VDPAU will four entries from the array, and treat them
+ *      as the colors corresponding to the upper-left,
+ *      upper-right, lower-right and lower-left corners of the
+ *      post-rotation source (i.e. indices 0, 1, 2 and 3 run
+ *      clockwise from the upper left corner). If the flag
+ *      VDP_OUTPUT_SURFACE_RENDER_COLOR_PER_VERTEX is not
+ *      set, VDPAU will use the single VdpColor for all four
+ *      corners. If colors is NULL then red, green, blue and
+ *      alpha values of 1.0 will be used.
+ * \param[in] blend_state If a blend state is provided, the
+ *     blend state will be used for the composite operation. If
+ *     NULL, blending is effectively disabled, which is
+ *     equivalent to a blend equation of ADD, source blend
+ *     factors of ONE and destination blend factors of ZERO. The
+ *     blend math is the familiar OpenGL blend math:
+ *     \f[
+ *     dst.a = equation(blendFactorDstAlpha*dst.a,
+ *     blendFactorSrcAlpha*src.a);
+ *     \f]
+ *     \f[
+ *     dst.rgb = equation(blendFactorDstColor*dst.rgb,
+ *     blendFactorSrcColor*src.rgb);
+ *     \f]
+ * \param[in] flags A set of flags influencing how the
+ *       compositing operation works.
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_ROTATE_0
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_ROTATE_90
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_ROTATE_180
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_ROTATE_270
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_COLOR_PER_VERTEX
+ * \return VdpStatus The completion status of the operation.
+ *
+ * The general compositing pipeline is as follows.
+ *
+ * -# Extract source_rect from source_surface.
+ *
+ * -# The extracted source is rotated 0, 90, 180 or 270 degrees
+ *   according to the flags.
+ *
+ * -# The rotated source is component-wise multiplied by a
+ *    smooth-shaded quad with a (potentially) different color at
+ *    each vertex.
+ *
+ * -# The resulting rotated, smooth-shaded quad is scaled to the
+ *    size of destination_rect and composited with
+ *    destination_surface using the provided blend state.
+ *
+ */
+typedef VdpStatus VdpOutputSurfaceRenderOutputSurface(
+    VdpOutputSurface                         destination_surface,
+    VdpRect const *                          destination_rect,
+    VdpOutputSurface                         source_surface,
+    VdpRect const *                          source_rect,
+    VdpColor const *                         colors,
+    VdpOutputSurfaceRenderBlendState const * blend_state,
+    uint32_t                                 flags
+);
+
+/**
+ * \brief Composite a sub-rectangle of a \ref VdpBitmapSurface
+ *        "VdpBitmapSurface" into a sub-rectangle of a
+ *        \ref VdpOutputSurface VdpOutputSurface.
+ * \param[in] destination_surface The destination surface of the
+ *       compositing operation.
+ * \param[in] destination_rect The sub-rectangle of the
+ *       destination surface to update. If NULL, the entire
+ *       destination surface will be updated.
+ * \param[in] source_surface The source surface for the
+ *       compositing operation. The surface is treated as having
+ *       four components: red, green, blue and alpha. Any
+ *       missing components are treated as 1.0. For example, for
+ *       an A8 VdpBitmapSurface, alpha will come from the surface
+ *       but red, green and blue will be treated as 1.0. If
+ *       source_surface is NULL, all components will be treated
+ *       as 1.0. Note that destination_surface and
+ *       source_surface must have been allocated via the same
+ *       \ref VdpDevice "VdpDevice".
+ * \param[in] source_rect The sub-rectangle of the source
+ *       surface to read from. If NULL, the entire
+ *       source_surface will be read. Left/right ot top/bottom
+ *       co-ordinates may be swapped to flip the source. Any
+ *       flip occurs prior to any requested rotation. Values
+ *       from outside the source surface are valid and samples
+ *       at those locations will be taken from the nearest edge.
+ * \param[in] colors A pointer to an array of \ref VdpColor
+ *      "VdpColor" objects. If the flag
+ *      VDP_OUTPUT_SURFACE_RENDER_COLOR_PER_VERTEX is set,
+ *      VDPAU will four entries from the array, and treat them
+ *      as the colors corresponding to the upper-left,
+ *      upper-right, lower-right and lower-left corners of the
+ *      post-rotation source (i.e. indices 0, 1, 2 and 3 run
+ *      clockwise from the upper left corner). If the flag
+ *      VDP_OUTPUT_SURFACE_RENDER_COLOR_PER_VERTEX is not
+ *      set, VDPAU will use the single VdpColor for all four
+ *      corners. If colors is NULL then red, green, blue and
+ *      alpha values of 1.0 will be used.
+ * \param[in] blend_state If a blend state is provided, the
+ *     blend state will be used for the composite operation. If
+ *     NULL, blending is effectively disabled, which is
+ *     equivalent to a blend equation of ADD, source blend
+ *     factors of ONE and destination blend factors of ZERO. The
+ *     blend math is the familiar OpenGL blend math:
+ *     \f[
+ *     dst.a = equation(blendFactorDstAlpha*dst.a,
+ *     blendFactorSrcAlpha*src.a);
+ *     \f]
+ *     \f[
+ *     dst.rgb = equation(blendFactorDstColor*dst.rgb,
+ *     blendFactorSrcColor*src.rgb);
+ *     \f]
+ * \param[in] flags A set of flags influencing how the
+ *       compositing operation works.
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_ROTATE_0
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_ROTATE_90
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_ROTATE_180
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_ROTATE_270
+ * \arg \ref VDP_OUTPUT_SURFACE_RENDER_COLOR_PER_VERTEX
+ * \return VdpStatus The completion status of the operation.
+ *
+ * The general compositing pipeline is as follows.
+ *
+ * -# Extract source_rect from source_surface.
+ *
+ * -# The extracted source is rotated 0, 90, 180 or 270 degrees
+ *   according to the flags.
+ *
+ * -# The rotated source is component-wise multiplied by a
+ *    smooth-shaded quad with a (potentially) different color at
+ *    each vertex.
+ *
+ * -# The resulting rotated, smooth-shaded quad is scaled to the
+ *    size of destination_rect and composited with
+ *    destination_surface using the provided blend state.
+ *
+ */
+typedef VdpStatus VdpOutputSurfaceRenderBitmapSurface(
+    VdpOutputSurface                         destination_surface,
+    VdpRect const *                          destination_rect,
+    VdpBitmapSurface                         source_surface,
+    VdpRect const *                          source_rect,
+    VdpColor const *                         colors,
+    VdpOutputSurfaceRenderBlendState const * blend_state,
+    uint32_t                                 flags
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpDecoder VdpDecoder; Video Decoding object
+ *
+ * The VdpDecoder object decodes compressed video data, writing
+ * the results to a \ref VdpVideoSurface "VdpVideoSurface".
+ *
+ * A specific VDPAU implementation may support decoding multiple
+ * types of compressed video data. However, VdpDecoder objects
+ * are able to decode a specific type of compressed video data.
+ * This type must be specified during creation.
+ *
+ * @{
+ */
+
+/**
+ * \brief The set of all known compressed video formats, and
+ *        associated profiles, that may be decoded.
+ */
+typedef uint32_t VdpDecoderProfile;
+
+/** \hideinitializer */
+#define VDP_DECODER_PROFILE_MPEG1                       (VdpDecoderProfile)0
+/** \hideinitializer */
+#define VDP_DECODER_PROFILE_MPEG2_SIMPLE                (VdpDecoderProfile)1
+/** \hideinitializer */
+#define VDP_DECODER_PROFILE_MPEG2_MAIN                  (VdpDecoderProfile)2
+/** \hideinitializer */
+/** \brief MPEG 4 part 10 == H.264 == AVC */
+#define VDP_DECODER_PROFILE_H264_BASELINE               (VdpDecoderProfile)6
+/** \hideinitializer */
+#define VDP_DECODER_PROFILE_H264_MAIN                   (VdpDecoderProfile)7
+/** \hideinitializer */
+#define VDP_DECODER_PROFILE_H264_HIGH                   (VdpDecoderProfile)8
+/** \hideinitializer */
+#define VDP_DECODER_PROFILE_VC1_SIMPLE                  (VdpDecoderProfile)9
+/** \hideinitializer */
+#define VDP_DECODER_PROFILE_VC1_MAIN                    (VdpDecoderProfile)10
+/** \hideinitializer */
+#define VDP_DECODER_PROFILE_VC1_ADVANCED                (VdpDecoderProfile)11
+
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_MPEG1_NA 0
+
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_MPEG2_LL   0
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_MPEG2_ML   1
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_MPEG2_HL14 2
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_MPEG2_HL   3
+
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_1     10
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_1b    9
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_1_1   11
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_1_2   12
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_1_3   13
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_2     20
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_2_1   21
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_2_2   22
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_3     30
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_3_1   31
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_3_2   32
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_4     40
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_4_1   41
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_4_2   42
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_5     50
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_H264_5_1   51
+
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_SIMPLE_LOW    0
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_SIMPLE_MEDIUM 1
+
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_MAIN_LOW    0
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_MAIN_MEDIUM 1
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_MAIN_HIGH   2
+
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_ADVANCED_L0 0
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_ADVANCED_L1 1
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_ADVANCED_L2 2
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_ADVANCED_L3 3
+/** \hideinitializer */
+#define VDP_DECODER_LEVEL_VC1_ADVANCED_L4 4
+
+/**
+ * \brief Query the implementation's VdpDecoder capabilities.
+ * \param[in] device The device to query.
+ * \param[in] profile The decoder profile for which information is requested.
+ * \param[out] is_supported Is this profile supported?
+ * \param[out] max_level The maximum specification level supported for this
+ *       profile.
+ * \param[out] max_macroblocks The maximum supported surface size in
+ *       macroblocks. Note that this could be greater than that dictated by
+ *       the maximum level.
+ * \param[out] max_width The maximum supported surface width for this profile.
+ *       Note that this could be greater than that dictated by the maximum
+ *       level.
+ * \param[out] max_height The maximum supported surface height for this
+ *       profile. Note that this could be greater than that dictated by the
+ *       maximum level.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpDecoderQueryCapabilities(
+    VdpDevice         device,
+    VdpDecoderProfile profile,
+    /* output parameters follow */
+    VdpBool *         is_supported,
+    uint32_t *        max_level,
+    uint32_t *        max_macroblocks,
+    uint32_t *        max_width,
+    uint32_t *        max_height
+);
+
+/**
+ * \brief An opaque handle representing a VdpDecoder object.
+ */
+typedef uint32_t VdpDecoder;
+
+/**
+ * \brief Create a VdpDecoder.
+ * \param[in] device The device that will contain the surface.
+ * \param[in] profile The video format the decoder will decode.
+ * \param[in] width The width of the new surface.
+ * \param[in] height The height of the new surface.
+ * \param[in] max_references The maximum number of references that may be
+ *       used by a single frame in the stream to be decoded. This parameter
+ *       exists mainly for formats such as H.264, where different streams
+ *       may use a different number of references. Requesting too many
+ *       references may waste memory, but decoding should still operate
+ *       correctly. Requesting too few references will cause decoding to
+ *       fail.
+ * \param[out] decoder The new decoder's handle.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpDecoderCreate(
+    VdpDevice         device,
+    VdpDecoderProfile profile,
+    uint32_t          width,
+    uint32_t          height,
+    uint32_t          max_references,
+    /* output parameters follow */
+    VdpDecoder *      decoder
+);
+
+/**
+ * \brief Destroy a VdpDecoder.
+ * \param[in] surface The decoder's handle.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpDecoderDestroy(
+    VdpDecoder decoder
+);
+
+/**
+ * \brief Retrieve the parameters used to create a
+ *        VdpDecoder.
+ * \param[in] surface The surface's handle.
+ * \param[out] profile The video format used to create the
+ *       decoder.
+ * \param[out] width The width of surfaces decode by the
+ *       decoder.
+ * \param[out] height The height of surfaces decode by the
+ *       decoder
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpDecoderGetParameters(
+    VdpDecoder          decoder,
+    /* output parameters follow */
+    VdpDecoderProfile * profile,
+    uint32_t *          width,
+    uint32_t *          height
+);
+
+#define VDP_BITSTREAM_BUFFER_VERSION 0
+
+/**
+ * \brief Application data buffer containing compressed video
+ *        data.
+ */
+typedef struct {
+    /**
+     * This field must be filled with VDP_BITSTREAM_BUFFER_VERSION
+     */
+    uint32_t     struct_version;
+    /** A pointer to the bitstream data bytes */
+    void const * bitstream;
+    /** The number of data bytes */
+    uint32_t     bitstream_bytes;
+} VdpBitstreamBuffer;
+
+/**
+ * \brief A generic "picture information" pointer type. 
+ *  
+ * This type serves solely to document the expected usage of a 
+ * generic (void *) function parameter. In actual usage, the 
+ * application is expected to physically provide a pointer to an 
+ * instance of one of the "real" VdpPictureInfo* structures, 
+ * picking the type appropriate for the decoder object in 
+ * question. 
+ */
+typedef void * VdpPictureInfo;
+
+/**
+ * \brief Picture parameter information for an MPEG 1 or MPEG 2
+ *        picture.
+ *
+ * Note: References to "copy of bitstream field" in the field descriptions
+ * may refer to data literally parsed from the bitstream, or derived from
+ * the bitstream using a mechanism described in the specification.
+ */
+typedef struct {
+    /**
+     * Reference used by B and P frames.
+     * Set to VDP_INVALID_HANDLE when not used.
+     */
+    VdpVideoSurface forward_reference;
+    /**
+     * Reference used by B frames.
+     * Set to VDP_INVALID_HANDLE when not used.
+     */
+    VdpVideoSurface backward_reference;
+    /** Number of slices in the bitstream provided. */
+    uint32_t        slice_count;
+
+    /** Copy of the MPEG bitstream field. */
+    uint8_t picture_structure;
+    /** Copy of the MPEG bitstream field. */
+    uint8_t picture_coding_type;
+    /** Copy of the MPEG bitstream field. */
+    uint8_t intra_dc_precision;
+    /** Copy of the MPEG bitstream field. */
+    uint8_t frame_pred_frame_dct;
+    /** Copy of the MPEG bitstream field. */
+    uint8_t concealment_motion_vectors;
+    /** Copy of the MPEG bitstream field. */
+    uint8_t intra_vlc_format;
+    /** Copy of the MPEG bitstream field. */
+    uint8_t alternate_scan;
+    /** Copy of the MPEG bitstream field. */
+    uint8_t q_scale_type;
+    /** Copy of the MPEG bitstream field. */
+    uint8_t top_field_first;
+    /** Copy of the MPEG-1 bitstream field. For MPEG-2, set to 0. */
+    uint8_t full_pel_forward_vector;
+    /** Copy of the MPEG-1 bitstream field. For MPEG-2, set to 0. */
+    uint8_t full_pel_backward_vector;
+    /**
+     * Copy of the MPEG bitstream field.
+     * For MPEG-1, fill both horizontal and vertical entries.
+     */
+    uint8_t f_code[2][2];
+    /** Copy of the MPEG bitstream field, converted to raster order. */
+    uint8_t intra_quantizer_matrix[64];
+    /** Copy of the MPEG bitstream field, converted to raster order. */
+    uint8_t non_intra_quantizer_matrix[64];
+} VdpPictureInfoMPEG1Or2;
+
+/**
+ * \brief Information about an H.264 reference frame
+ *
+ * Note: References to "copy of bitstream field" in the field descriptions
+ * may refer to data literally parsed from the bitstream, or derived from
+ * the bitstream using a mechanism described in the specification.
+ */
+typedef struct {
+    /**
+     * The surface that contains the reference image.
+     * Set to VDP_INVALID_HANDLE for unused entries.
+     */
+    VdpVideoSurface surface;
+    /** Is this a long term reference (else short term). */
+    VdpBool         is_long_term;
+    /**
+     * Is the top field used as a reference.
+     * Set to VDP_FALSE for unused entries.
+     */
+    VdpBool         top_is_reference;
+    /**
+     * Is the bottom field used as a reference.
+     * Set to VDP_FALSE for unused entries.
+     */
+    VdpBool         bottom_is_reference;
+    /** [0]: top, [1]: bottom */
+    int32_t         field_order_cnt[2];
+    /**
+     * Copy of the H.264 bitstream field:
+     * frame_num from slice_header for short-term references,
+     * LongTermPicNum from decoding algorithm for long-term references.
+     */
+    uint16_t        frame_idx;
+} VdpReferenceFrameH264;
+
+/**
+ * \brief Picture parameter information for an H.264 picture.
+ *
+ * Note: The \ref referenceFrames array must contain the "DPB" as
+ * defined by the H.264 specification. In particular, once a
+ * reference frame has been decoded to a surface, that surface must
+ * continue to appear in the DPB until no longer required to predict
+ * any future frame. Once a surface is removed from the DPB, it can
+ * no longer be used as a reference, unless decoded again.
+ *
+ * Also note that only surfaces previously generated using \ref
+ * VdpDecoderRender may be used as reference frames. In particular,
+ * surfaces filled using any "put bits" API will not work.
+ *
+ * Note: References to "copy of bitstream field" in the field descriptions
+ * may refer to data literally parsed from the bitstream, or derived from
+ * the bitstream using a mechanism described in the specification.
+ */
+typedef struct {
+    /** Number of slices in the bitstream provided. */
+    uint32_t slice_count;
+    /** [0]: top, [1]: bottom */
+    int32_t  field_order_cnt[2];
+    /** Will the decoded frame be used as a reference later. */
+    VdpBool  is_reference;
+
+    /** Copy of the H.264 bitstream field. */
+    uint16_t frame_num;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  field_pic_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  bottom_field_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  num_ref_frames;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  mb_adaptive_frame_field_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  constrained_intra_pred_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  weighted_pred_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  weighted_bipred_idc;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  frame_mbs_only_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  transform_8x8_mode_flag;
+    /** Copy of the H.264 bitstream field. */
+    int8_t   chroma_qp_index_offset;
+    /** Copy of the H.264 bitstream field. */
+    int8_t   second_chroma_qp_index_offset;
+    /** Copy of the H.264 bitstream field. */
+    int8_t   pic_init_qp_minus26;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  num_ref_idx_l0_active_minus1;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  num_ref_idx_l1_active_minus1;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  log2_max_frame_num_minus4;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  pic_order_cnt_type;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  log2_max_pic_order_cnt_lsb_minus4;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  delta_pic_order_always_zero_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  direct_8x8_inference_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  entropy_coding_mode_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  pic_order_present_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  deblocking_filter_control_present_flag;
+    /** Copy of the H.264 bitstream field. */
+    uint8_t  redundant_pic_cnt_present_flag;
+
+    /** Copy of the H.264 bitstream field, converted to raster order. */
+    uint8_t scaling_lists_4x4[6][16];
+    /** Copy of the H.264 bitstream field, converted to raster order. */
+    uint8_t scaling_lists_8x8[2][64];
+
+    /** See \ref VdpPictureInfoH264 for instructions regarding this field. */
+    VdpReferenceFrameH264 referenceFrames[16];
+} VdpPictureInfoH264;
+
+/**
+ * \brief Picture parameter information for a VC1 picture.
+ *
+ * Note: References to "copy of bitstream field" in the field descriptions
+ * may refer to data literally parsed from the bitstream, or derived from
+ * the bitstream using a mechanism described in the specification.
+ */
+typedef struct {
+    /**
+     * Reference used by B and P frames.
+     * Set to VDP_INVALID_HANDLE when not used.
+     */
+    VdpVideoSurface forward_reference;
+    /**
+     * Reference used by B frames.
+     * Set to VDP_INVALID_HANDLE when not used.
+     */
+    VdpVideoSurface backward_reference;
+
+    /** Number of slices in the bitstream provided. */
+    uint32_t slice_count;
+    /** I=0, P=1, B=3, BI=4  from 7.1.1.4. */
+    uint8_t  picture_type;
+    /** Progressive=0, Frame-interlace=2, Field-interlace=3; see VC-1 7.1.1.15. */
+    uint8_t  frame_coding_mode;
+
+    /** Copy of the VC-1 bitstream field. See VC-1 6.1.5. */
+    uint8_t postprocflag;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.1.8. */
+    uint8_t pulldown;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.1.9. */
+    uint8_t interlace;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.1.10. */
+    uint8_t tfcntrflag;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.1.11. */
+    uint8_t finterpflag;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.1.3. */
+    uint8_t psf;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.8. */
+    uint8_t dquant;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.3. */
+    uint8_t panscan_flag;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.4. */
+    uint8_t refdist_flag;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.11. */
+    uint8_t quantizer;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.7. */
+    uint8_t extended_mv;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.14. */
+    uint8_t extended_dmv;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.10. */
+    uint8_t overlap;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.9. */
+    uint8_t vstransform;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.5. */
+    uint8_t loopfilter;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.6. */
+    uint8_t fastuvmc;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.12.15. */
+    uint8_t range_mapy_flag;
+    /** Copy of the VC-1 bitstream field. */
+    uint8_t range_mapy;
+    /** Copy of the VC-1 bitstream field. See VC-1 6.2.16. */
+    uint8_t range_mapuv_flag;
+    /** Copy of the VC-1 bitstream field. */
+    uint8_t range_mapuv;
+
+    /**
+     * Copy of the VC-1 bitstream field. See VC-1 J.1.10.
+     * Only used by simple and main profiles.
+     */
+    uint8_t multires;
+    /**
+     * Copy of the VC-1 bitstream field. See VC-1 J.1.16.
+     * Only used by simple and main profiles.
+     */
+    uint8_t syncmarker;
+    /**
+     * VC-1 SP/MP range reduction control.
+     * Only used by simple and main profiles.
+     * Bit 0: Copy of rangered VC-1 bitstream field; See VC-1 J.1.17.
+     * Bit 1: Copy of rangeredfrm VC-1 bitstream fiels; See VC-1 7.1.13.
+     */
+    uint8_t rangered;
+    /**
+     * Copy of the VC-1 bitstream field. See VC-1 J.1.17.
+     * Only used by simple and main profiles.
+     */
+    uint8_t maxbframes;
+
+    /**
+     * Out-of-loop deblocking enable.
+     * Bit 0 of POSTPROC from VC-1 7.1.1.27
+     * Note that bit 1 of POSTPROC (dering enable) should not be included.
+     */
+    uint8_t deblockEnable;
+    /**
+     * Parameter used by VC-1 Annex H deblocking algorithm. Note that VDPAU
+     * implementations may choose which deblocking algorithm to use.
+     * See VC-1 7.1.1.6
+     */
+    uint8_t pquant;
+} VdpPictureInfoVC1;
+
+/**
+ * \brief Decode a compressed field/frame and render the result
+ *        into a \ref VdpVideoSurface "VdpVideoSurface".
+ * \param[in] decoder The decoder object that will perform the
+ *       decode operation.
+ * \param[in] target The video surface to render to.
+ * \param[in] picture_info A (pointer to a) structure containing
+ *       information about the picture to be decoded. Note that
+ *       the appropriate type of VdpPictureInfo* structure must
+ *       be provided to match to profile that the decoder was
+ *       created for.
+ * \param[in] bitstream_buffer_count The number of bitstream
+ *       buffers containing compressed data for this picture.
+ * \param[in] bitstream_buffers An array of bitstream buffers.
+ * \return VdpStatus The completion status of the operation.
+ *
+ * See \ref video_mixer_usage for additional information.
+ */
+typedef VdpStatus VdpDecoderRender(
+    VdpDecoder                 decoder,
+    VdpVideoSurface            target,
+    VdpPictureInfo const *     picture_info,
+    uint32_t                   bitstream_buffer_count,
+    VdpBitstreamBuffer const * bitstream_buffers
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpVideoMixer VdpVideoMixer; Video Post-processing \
+ *           and Compositing object
+ *  
+ * VdpVideoMixer can perform some subset of the following
+ * post-processing steps on video:
+ * - De-interlacing
+ *   - Various types, with or without inverse telecine
+ * - Noise-reduction
+ * - Sharpness adjustment
+ * - Color space conversion to RGB
+ * - Chroma format upscaling to 4:4:4
+ *
+ * A VdpVideoMixer takes a source \ref VdpVideoSurface
+ * "VdpVideoSurface" VdpVideoSurface and performs various video
+ * processing steps on it (potentially using information from
+ * past or future video surfaces). It scales the video and
+ * converts it to RGB, then optionally composites it with
+ * multiple auxiliary \ref VdpOutputSurface "VdpOutputSurface"s 
+ * before writing the result to the destination \ref 
+ * VdpOutputSurface "VdpOutputSurface". 
+ *
+ * The video mixer compositing model is as follows:
+ *
+ * - A rectangle will be rendered on an output surface. No
+ *   pixels will be rendered outside of this output rectangle.
+ *   The contents of this rectangle will be a composite of many
+ *   layers.
+ *
+ * - The first layer is the background color. The background
+ *   color will fill the entire rectangle.
+ *  
+ * - The second layer is the processed video which has been
+ *   converted to RGB. These pixels will overwrite the
+ *   background color of the first layer except where the second
+ *   layer's rectangle does not completely cover the output
+ *   rectangle. In those regions the background color will
+ *   continue to show. If any portion of the second layer's
+ *   output rectangle is outside of the output rectangle, those
+ *   portions will be clipped.
+ *
+ * - The third layer contains some number of auxiliary layers 
+ *   (in the form of \ref VdpOutputSurface "VdpOutputSurface"s)
+ *   which will be composited using the alpha value from the
+ *   those surfaces. The compositing operations are equivalent
+ *   to rendering with \ref VdpOutputSurfaceRenderOutputSurface
+ *   using a source blend factor of SOURCE_ALPHA, a destination
+ *   blend factor of ONE_MINUS_SOURCE_ALPHA and an equation of
+ *   ADD.
+ *
+ * @{
+ */
+
+/**
+ * \brief A VdpVideoMixer feature that must be requested at 
+ *        creation time to be used.
+ *  
+ * Certain advanced VdpVideoMixer features are optional, and the 
+ * ability to use those features at all must be requested when 
+ * the VdpVideoMixer object is created. Each feature is named via 
+ * a specific VdpVideoMixerFeature value.
+ *  
+ * Once requested, these features are permanently available 
+ * within that specific VdpVideoMixer object. All features that 
+ * are not explicitly requested at creation time default to 
+ * being permanently unavailable. 
+ *  
+ * Even when requested, all features default to being initially 
+ * disabled. However, applications can subsequently enable and 
+ * disable features at any time. See \ref 
+ * VdpVideoMixerSetFeatureEnables. 
+ *  
+ * Some features allow configuration of their operation. Each 
+ * configurable item is an \ref VdpVideoMixerAttribute. These 
+ * attributes may be manipulated at any time using \ref 
+ * VdpVideoMixerSetAttributeValues. 
+ */
+typedef uint32_t VdpVideoMixerFeature;
+
+/**
+ * \hideinitializer
+ * \brief A VdpVideoMixerFeature.
+ *
+ * When requested and enabled, motion adaptive temporal 
+ * deinterlacing will be used on interlaced content. 
+ *  
+ * When multiple de-interlacing options are requested and 
+ * enabled, the back-end implementation chooses the best 
+ * algorithm to apply. 
+ */
+#define VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL         (VdpVideoMixerFeature)0
+/**
+ * \hideinitializer
+ * \brief A VdpVideoMixerFeature.
+ *
+ * When requested and enabled, this enables a more advanced 
+ * version of temporal de-interlacing, that additionally uses 
+ * edge-guided spatial interpolation. 
+ *  
+ * When multiple de-interlacing options are requested and 
+ * enabled, the back-end implementation chooses the best 
+ * algorithm to apply. 
+ */
+#define VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL (VdpVideoMixerFeature)1
+/**
+ * \hideinitializer
+ * \brief A VdpVideoMixerFeature.
+ *
+ * When requested and enabled, cadence detection will be enabled
+ * on interlaced content and the video mixer will try to extract 
+ * progressive frames from pull-down material. 
+ */
+#define VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE             (VdpVideoMixerFeature)2
+/**
+ * \hideinitializer
+ * \brief A VdpVideoMixerFeature.
+ *
+ * When requested and enabled, a noise reduction algorithm will 
+ * be applied to the video. 
+ */
+#define VDP_VIDEO_MIXER_FEATURE_NOISE_REDUCTION              (VdpVideoMixerFeature)3
+/**
+ * \hideinitializer
+ * \brief A VdpVideoMixerFeature.
+ *
+ * When requested and enabled, a sharpening algorithm will be 
+ * applied to the video. 
+ */
+#define VDP_VIDEO_MIXER_FEATURE_SHARPNESS                    (VdpVideoMixerFeature)4
+/**
+ * \hideinitializer
+ * \brief A VdpVideoMixerFeature.
+ *
+ * When requested and enabled, the alpha of the rendered 
+ * surface, which is normally set to the alpha of the background 
+ * color, will be forced to 0.0 on pixels corresponding to 
+ * source video surface luminance values in the range specified 
+ * by attributes \ref VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA
+ * to \ref VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA. This 
+ * keying is performed after scaling and de-interlacing. 
+ */
+#define VDP_VIDEO_MIXER_FEATURE_LUMA_KEY                     (VdpVideoMixerFeature)5
+
+/**
+ * \brief A VdpVideoMixer creation parameter.
+ * 
+ * When a VdpVideoMixer is created, certain parameters may be
+ * supplied. Each parameter is named via a specific
+ * VdpVideoMixerParameter value. 
+ *  
+ * Each parameter has a specific type, and specific default 
+ * value if not specified at VdpVideoMixer creation time. The 
+ * application may query the legal supported range for some 
+ * parameters. 
+ */
+typedef uint32_t VdpVideoMixerParameter;
+
+/** 
+ * \hideinitializer 
+ * \brief The exact width of input video surfaces. 
+ *  
+ * This parameter's type is uint32_t. 
+ *  
+ * This parameter defaults to 0 if not specified, which entails 
+ * that it must be specified. 
+ *  
+ * The application may query this parameter's supported 
+ * range. 
+ */
+#define VDP_VIDEO_MIXER_PARAMETER_VIDEO_SURFACE_WIDTH  (VdpVideoMixerParameter)0
+/** 
+ * \hideinitializer 
+ * \brief The exact height of input video surfaces. 
+ *  
+ * This parameter's type is uint32_t. 
+ *  
+ * This parameter defaults to 0 if not specified, which entails 
+ * that it must be specified. 
+ *  
+ * The application may query this parameter's supported 
+ * range.
+ */ 
+#define VDP_VIDEO_MIXER_PARAMETER_VIDEO_SURFACE_HEIGHT (VdpVideoMixerParameter)1
+/** 
+ * \hideinitializer 
+ * \brief The chroma type of the input video surfaces the will 
+ *        process.
+ *  
+ * This parameter's type is VdpChromaType.
+ *  
+ * If not specified, this parameter defaults to
+ * VDP_CHROMA_TYPE_420. 
+ *  
+ * The application may not query this application's supported 
+ * range, since it is a potentially disjoint enumeration.
+ */ 
+#define VDP_VIDEO_MIXER_PARAMETER_CHROMA_TYPE          (VdpVideoMixerParameter)2
+/** 
+ * \hideinitializer 
+ * \brief The number of auxiliary layers in the mixer's 
+ *        compositing model.
+ *  
+ * Note that this indicates the maximum number of layers that 
+ * may be processed by a given \ref VdpVideoMixer "VdpVideoMixer" 
+ * object. Each individual \ref VdpVideoMixerRender invocation 
+ * may choose to use a different number of actual layers, from 0 
+ * up to this limit.
+ * 
+ * This attribute's type is uint32_t. 
+ *  
+ * If not specified, this parameter defaults to 0.
+ *  
+ * The application may query this parameter's supported 
+ * range.
+ */ 
+#define VDP_VIDEO_MIXER_PARAMETER_LAYERS               (VdpVideoMixerParameter)3
+
+/**
+ * \brief An adjustable attribute of VdpVideoMixer operation. 
+ *  
+ * Various attributes of VdpVideoMixer operation may be adjusted 
+ * at any time. Each attribute is named via a specific
+ * VdpVideoMixerAttribute value. 
+ *  
+ * Each attribute has a specific type, and specific default 
+ * value if not specified at VdpVideoMixer creation time. The 
+ * application may query the legal supported range for some 
+ * attributes. 
+ */
+typedef uint32_t VdpVideoMixerAttribute;
+
+/** 
+ * \hideinitializer 
+ * \brief The background color in the VdpVideoMixer's compositing 
+ *        model.
+ *  
+ * This attribute's type is VdpColor. 
+ *  
+ * This parameter defaults to black (all color components 0.0 
+ * and alpha 1.0).
+ *  
+ * The application may not query this parameter's supported 
+ * range, since the type is not scalar.
+ */ 
+#define VDP_VIDEO_MIXER_ATTRIBUTE_BACKGROUND_COLOR      (VdpVideoMixerAttribute)0
+/** 
+ * \hideinitializer 
+ * \brief The color-space conversion matrix used by the 
+ *        VdpVideoMixer.
+ *  
+ * This attribute's type is \ref VdpCSCMatrix. 
+ *
+ * Note: When using \ref VdpVideoMixerGetAttributeValues to retrieve the
+ * current CSC matrix, the attribute_values array must contain a pointer to
+ * a pointer a VdpCSCMatrix (VdpCSCMatrix** as a void *). The get function will
+ * either initialize the referenced CSC matrix to the current value, *or*
+ * clear the supplied pointer to NULL, if the previous set call supplied a
+ * value of NULL in parameter_values, to request the default matrix.
+ * 
+ * \code
+ * VdpCSCMatrix   matrix;
+ * VdpCSCMatrix * matrix_ptr;
+ * void * attribute_values[] = {&matrix_ptr};
+ * VdpStatus st = vdp_video_mixer_get_attribute_values(..., attribute_values, ...);
+ * \endcode
+ *
+ * This parameter defaults to a matrix suitable for ITU-R BT.601
+ * input surfaces, with no procamp adjustments. 
+ *  
+ * The application may not query this parameter's supported 
+ * range, since the type is not scalar.
+ */ 
+#define VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX            (VdpVideoMixerAttribute)1
+/** 
+ * \hideinitializer 
+ * \brief The amount of noise reduction algorithm to apply.
+ *  
+ * This attribute's type is float. 
+ *  
+ * This parameter defaults to 0.0, which equates to no noise 
+ * reduction.
+ *  
+ * The application may query this parameter's supported range. 
+ * However, the range is fixed as 0.0...1.0. 
+ */ 
+#define VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL (VdpVideoMixerAttribute)2
+/** 
+ * \hideinitializer 
+ * \brief The amount of sharpening, or blurring, to apply.
+ *  
+ * This attribute's type is float.
+ *  
+ * This parameter defaults to 0.0, which equates to no 
+ * sharpening. 
+ *  
+ * Positive values request sharpening. Negative values request 
+ * blurring. 
+ *  
+ * The application may query this parameter's supported range. 
+ * However, the range is fixed as -1.0...1.0. 
+ */ 
+#define VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL       (VdpVideoMixerAttribute)3
+/** 
+ * \hideinitializer 
+ * \brief The minimum luma value for the luma key algorithm.
+ *  
+ * This attribute's type is float. 
+ *  
+ * This parameter defaults to 0.0.
+ *  
+ * The application may query this parameter's supported range. 
+ * However, the range is fixed as 0.0...1.0. 
+ */ 
+#define VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA     (VdpVideoMixerAttribute)4
+/** 
+ * \hideinitializer 
+ * \brief The maximum luma value for the luma key algorithm.
+ *  
+ * This attribute's type is float. 
+ *  
+ * This parameter defaults to 1.0.
+ *  
+ * The application may query this parameter's supported range. 
+ * However, the range is fixed as 0.0...1.0. 
+ */ 
+#define VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA     (VdpVideoMixerAttribute)5
+/** 
+ * \hideinitializer 
+ * \brief Whether de-interlacers should operate solely on luma, and bob chroma.
+ *  
+ * Note: This attribute only affects advanced de-interlacing algorithms, not
+ * bob or weave.
+ *
+ * This attribute's type is uint8_t.
+ *  
+ * This parameter defaults to 0.
+ *  
+ * The application may query this parameter's supported range. 
+ * However, the range is fixed as 0 (no/off) ... 1 (yes/on). 
+ */ 
+#define VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE (VdpVideoMixerAttribute)6
+
+/**
+ * \brief Query the implementation's support for a specific 
+ *        feature.
+ * \param[in] device The device to query.
+ * \param[in] feature The feature for which support is to be
+ *       queried.
+ * \param[out] is_supported Is the specified feature supported?
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerQueryFeatureSupport(
+    VdpDevice            device,
+    VdpVideoMixerFeature feature,
+    /* output parameters follow */
+    VdpBool *            is_supported
+);
+
+/**
+ * \brief Query the implementation's support for a specific 
+ *        parameter.
+ * \param[in] device The device to query.
+ * \param[in] parameter The parameter for which support is to be
+ *       queried.
+ * \param[out] is_supported Is the specified parameter 
+ *       supported?
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerQueryParameterSupport(
+    VdpDevice              device,
+    VdpVideoMixerParameter parameter,
+    /* output parameters follow */
+    VdpBool *              is_supported
+);
+
+/**
+ * \brief Query the implementation's support for a specific 
+ *        attribute.
+ * \param[in] device The device to query.
+ * \param[in] feature The feature for which support is to be
+ *       queried.
+ * \param[out] is_supported Is the specified feature supported?
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerQueryAttributeSupport(
+    VdpDevice              device,
+    VdpVideoMixerAttribute attribute,
+    /* output parameters follow */
+    VdpBool *              is_supported
+);
+
+/**
+ * \brief Query the implementation's supported for a specific 
+ *        parameter.
+ * \param[in] device The device to query.
+ * \param[in] parameter The parameter for which support is to be
+ *       queried.
+ * \param[out] min_value The minimum supported value.
+ * \param[out] max_value The maximum supported value.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerQueryParameterValueRange(
+    VdpDevice              device,
+    VdpVideoMixerParameter parameter,
+    /* output parameters follow */
+    void *                min_value,
+    void *                max_value
+);
+
+/**
+ * \brief Query the implementation's supported for a specific 
+ *        attribute.
+ * \param[in] device The device to query.
+ * \param[in] attribute The attribute for which support is to be
+ *       queried.
+ * \param[out] min_value The minimum supported value.
+ * \param[out] max_value The maximum supported value.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerQueryAttributeValueRange(
+    VdpDevice              device,
+    VdpVideoMixerAttribute attribute,
+    /* output parameters follow */
+    void *                min_value,
+    void *                max_value
+);
+
+/**
+ * \brief An opaque handle representing a VdpVideoMixer object.
+ */
+typedef uint32_t VdpVideoMixer;
+
+/**
+ * \brief Create a VdpVideoMixer.
+ * \param[in] device The device that will contain the mixer. 
+ * \param[in] feature_count The number of features to request.
+ * \param[in] features The list of features to request.
+ * \param[in] parameter_count The number of parameters to set.
+ * \param[in] parameters The list of parameters to set.
+ * \param[in] parameter_values The values for the parameters. Note that each
+ *     entry in the value array is a pointer to the actual value. In other
+ *     words, the values themselves are not cast to "void *" and passed 
+ *     "inside" the array.
+ * \param[out] mixer The new mixer's handle.
+ * \return VdpStatus The completion status of the operation. 
+ *  
+ * Initially, all requested features will be disabled. They can 
+ * be enabled using \ref VdpVideoMixerSetFeatureEnables. 
+ *  
+ * Initially, all attributes will have default values. Values 
+ * can be changed using \ref VdpVideoMixerSetAttributeValues.
+ */
+typedef VdpStatus VdpVideoMixerCreate(
+    VdpDevice                      device,
+    // The set of features to request
+    uint32_t                       feature_count,
+    VdpVideoMixerFeature const *   features,
+    // The parameters used during creation
+    uint32_t                       parameter_count,
+    VdpVideoMixerParameter const * parameters,
+    void const * const *           parameter_values,
+    /* output parameters follow */
+    VdpVideoMixer *                mixer
+);
+
+/**
+ * \brief Enable or disable features.
+ * \param[in] mixer The mixer to manipulate.
+ * \param[in] feature_count The number of features to 
+ *       enable/disable.
+ * \param[in] features The list of features to enable/disable.
+ * \param[in] feature_enables The list of new feature enable 
+ *       values.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerSetFeatureEnables(
+    VdpVideoMixer                mixer,
+    uint32_t                     feature_count,
+    VdpVideoMixerFeature const * features,
+    VdpBool const *              feature_enables
+);
+
+/**
+ * \brief Set attribute values
+ * \param[in] mixer The mixer to manipulate.
+ * \param[in] attribute_count The number of attributes to set.
+ * \param[in] attributes The list of attributes to set.
+ * \param[in] attribute_values The values for the attributes. Note that each
+ *     entry in the value array is a pointer to the actual value. In other
+ *     words, the values themselves are not cast to "void *" and passed 
+ *     "inside" the array. A NULL pointer requests that the default value be
+ *     set for that attribute.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerSetAttributeValues(
+    VdpVideoMixer                  mixer,
+    uint32_t                       attribute_count,
+    VdpVideoMixerAttribute const * attributes,
+    void const * const *           attribute_values
+);
+
+/**
+ * \brief Retrieve whether features were requested at creation 
+ *        time.
+ * \param[in] mixer The mixer to query.
+ * \param[in] feature_count The number of features to query.
+ * \param[in] features The list of features to query.
+ * \param[out] feature_supported A list of values indicating 
+ *       whether the feature was requested, and hence is
+ *       available.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerGetFeatureSupport(
+    VdpVideoMixer                mixer,
+    uint32_t                     feature_count,
+    VdpVideoMixerFeature const * features,
+    /* output parameters follow */
+    VdpBool *                    feature_supports
+);
+
+/**
+ * \brief Retrieve whether features are enabled.
+ * \param[in] mixer The mixer to manipulate.
+ * \param[in] feature_count The number of features to query.
+ * \param[in] features The list of features to query.
+ * \param[out] feature_enabled A list of values indicating 
+ *       whether the feature is enabled.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerGetFeatureEnables(
+    VdpVideoMixer                mixer,
+    uint32_t                     feature_count,
+    VdpVideoMixerFeature const * features,
+    /* output parameters follow */
+    VdpBool *                    feature_enables
+);
+
+/**
+ * \brief Retrieve parameter values given at creation time.
+ * \param[in] mixer The mixer to manipulate.
+ * \param[in] parameter_count The number of parameters to query.
+ * \param[in] parameters The list of parameters to query.
+ * \param[out] parameter_values The list of current values for 
+ *     the parameters. Note that each entry in the value array is a pointer to
+ *     storage that will receive the actual value. If the attribute's type is
+ *     a pointer itself, please closely read the documentation for that
+ *     attribute type for any other data passing requirements.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerGetParameterValues(
+    VdpVideoMixer                  mixer,
+    uint32_t                       parameter_count,
+    VdpVideoMixerParameter const * parameters,
+    /* output parameters follow */
+    void * const *                 parameter_values
+);
+
+/**
+ * \brief Retrieve current attribute values.
+ * \param[in] mixer The mixer to manipulate.
+ * \param[in] attribute_count The number of attributes to query.
+ * \param[in] attributes The list of attributes to query.
+ * \param[out] attribute_values The list of current values for 
+ *     the attributes. Note that each entry in the value array is a pointer to
+ *     storage that will receive the actual value. If the attribute's type is
+ *     a pointer itself, please closely read the documentation for that
+ *     attribute type for any other data passing requirements.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerGetAttributeValues(
+    VdpVideoMixer                  mixer,
+    uint32_t                       attribute_count,
+    VdpVideoMixerAttribute const * attributes,
+    /* output parameters follow */
+    void * const *                 attribute_values
+);
+
+/**
+ * \brief Destroy a VdpVideoMixer.
+ * \param[in] device The device to destroy.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpVideoMixerDestroy(
+    VdpVideoMixer mixer
+);
+
+/** 
+ * \hideinitializer 
+ * \brief The structure of the picture present in a \ref
+ *        VdpVideoSurface "VdpVideoSurface".
+ */ 
+typedef enum {
+    /** 
+     * The picture is a field, and is the top field of the surface. 
+     */ 
+    VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD,
+    /** 
+     * The picture is a field, and is the bottom field of the
+     * surface.
+     */
+    VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD,
+    /** 
+     * The picture is a frame, and hence is the entire surface. 
+     */ 
+    VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME,
+} VdpVideoMixerPictureStructure;
+
+#define VDP_LAYER_VERSION 0
+
+/** 
+ * \brief Definition of an additional \ref VdpOutputSurface 
+ *        "VdpOutputSurface" layer in the composting model.
+ */ 
+typedef struct {
+    /**
+     * This field must be filled with VDP_LAYER_VERSION
+     */
+    uint32_t struct_version;
+    /** 
+     * The surface to composite from. 
+     */ 
+    VdpOutputSurface source_surface;
+    /** 
+     * The sub-rectangle of the source surface to use. If NULL, the 
+     * entire source surface will be used. 
+     */ 
+    VdpRect const *  source_rect;
+    /** 
+     * The sub-rectangle of the destination surface to map 
+     * this layer into. This rectangle is relative to the entire 
+     * destination surface. This rectangle will be clipped by \ref 
+     * VdpVideoMixerRender's \b destination_rect. If NULL, the 
+     * destination rectangle will be sized to match the source 
+     * rectangle, and will be located at the origin. 
+     */ 
+     VdpRect const * destination_rect;
+} VdpLayer;
+
+/**
+ * \brief Perform a video post-processing and compositing 
+ *        operation.
+ * \param[in] mixer The mixer object that will perform the 
+ *       mixing/rendering operation.
+ * \param[in] background_surface A background image. If set to any value other
+ *       than VDP_INVALID_HANDLE, the specific surface will be used instead of
+ *       the background color as the first layer in the mixer's compositing
+ *       process.
+ * \param[in] background_source_rect When background_surface is specified,
+ *       this parameter indicates the portion of background_surface that will
+ *       be used as the background layer. The specified region will be
+ *       extracted and scaled to match the size of destination_rect. If NULL,
+ *       the entire background_surface will be used.
+ * \param[in] current_picture_structure The picture structure of 
+ *       the field/frame to be processed. This field/frame is
+ *       presented in the \b video_surface_current parameter. If
+ *       frame, then all \b video_surface_* parameters are
+ *       assumed to be frames. If field, then all
+ *       video_surface_* parameters are assumed to be fields,
+ *       with alternating top/bottom-ness derived from
+ *       video_surface_current.
+ * \param[in] video_surfaces_past_count The number of provided 
+ *       fields/frames prior to the current picture.
+ * \param[in] video_surfaces_past The fields/frames prior to the
+ *       current field/frame. Note that array index 0 is the
+ *       field/frame temporally nearest to the current
+ *       field/frame, with increasing array indices used for
+ *       older frames. Unavailable entries may be set to
+ *       \ref VDP_INVALID_HANDLE.
+ * \param[in] video_surface_current The field/frame to be 
+ *       processed.
+ * \param[in] video_surfaces_future_count The number of provided
+ *       fields/frames following the current picture.
+ * \param[in] video_surfaces_future The fields/frames that 
+ *       follow the current field/frame. Note that array index 0
+ *       is the field/frame temporally nearest to the current
+ *       field/frame, with increasing array indices used for
+ *       newer frames. Unavailable entries may be set to \ref
+ *       VDP_INVALID_HANDLE.
+ * \param[in] video_source_rect The sub-rectangle of the source 
+ *       video surface to extract and process. If NULL, the
+ *       entire surface will be used.
+ * \param[in] destination_surface
+ * \param[in] destination_rect The sub-rectangle of the 
+ *       destination surface to modify. Note that rectangle clips
+ *       all other actions.
+ * \param[in] destination_video_rect The sub-rectangle of the 
+ *       destination surface that will contain the processed
+ *       video. This rectangle is relative to the entire
+ *       destination surface. This rectangle is clipped by \b
+ *       destination_rect. If NULL, the destination rectangle
+ *       will be sized to match the source rectangle, and will
+ *       be located at the origin.
+ * \param[in] layer_count The number of additional layers to
+ *       composite above the video.
+ * \param[in] layers The array of additional layers to composite
+ *       above the video.
+ * \return VdpStatus The completion status of the operation. 
+ *  
+ * For a complete discussion of how to use this API, please see 
+ * \ref video_mixer_usage. 
+ */
+typedef VdpStatus VdpVideoMixerRender(
+    VdpVideoMixer                 mixer,
+    VdpOutputSurface              background_surface,
+    VdpRect const *               background_source_rect,
+    VdpVideoMixerPictureStructure current_picture_structure,
+    uint32_t                      video_surface_past_count,
+    VdpVideoSurface const *       video_surface_past,
+    VdpVideoSurface               video_surface_current,
+    uint32_t                      video_surface_future_count,
+    VdpVideoSurface const *       video_surface_future,
+    VdpRect const *               video_source_rect,
+    VdpOutputSurface              destination_surface,
+    VdpRect const *               destination_rect,
+    VdpRect const *               destination_video_rect,
+    uint32_t                      layer_count,
+    VdpLayer const *              layers
+);
+
+/*@}*/
+
+/**
+ * \defgroup VdpPresentationQueue VdpPresentationQueue; Video \
+ *           presentation (display) object
+ *
+ * The VdpPresentationQueue manages a queue of surfaces and
+ * associated timestamps. For each surface in the queue, once
+ * the associated timestamp is reached, the surface is displayed
+ * to the user. This timestamp-based approach yields high
+ * quality video delivery.
+ *  
+ * The exact location of the displayed content is Window System 
+ * specific. For this reason, the \ref api_winsys provides an 
+ * API to create a \ref VdpPresentationQueueTarget object (e.g. 
+ * via \ref VdpPresentationQueueTargetCreateX11) which 
+ * encapsulates this information. 
+ *  
+ * Note that the presentation queue performs no scaling of 
+ * surfaces to match the display target's size, aspect ratio, 
+ * etc. 
+ *  
+ * Surfaces that are too large to fit into the display target 
+ * will be clipped. Surfaces that are too small to fill the 
+ * display target will be aligned to the top-left corner of the 
+ * display target, with the balance of the display target being 
+ * filled with a constant configurable "background" color.
+ *  
+ * Note that the presentation queue operates in a manner that is 
+ * semantically equivalent to an overlay surface, with any 
+ * required color key painting hidden internally. However, 
+ * implementations are free to use whatever semantically 
+ * equivalent technique they wish. Note that implementations
+ * that actually use color-keyed overlays will typically use
+ * the "background" color as the overlay color key value, so
+ * this color should be chosen with care.
+ *  
+ * @{ 
+ */
+
+/** 
+ * \brief The representation of a point in time.
+ * 
+ * VdpTime timestamps are intended to be a high-precision timing
+ * system, potentially independent from any other time domain in
+ * the system.
+ * 
+ * Time is represented in units of nanoseconds. The origin
+ * (i.e. the time represented by a value of 0) is implementation
+ * dependent.
+ */
+typedef uint64_t VdpTime;
+
+/**
+ * \brief An opaque handle representing the location where 
+ *        video will be presented.
+ *  
+ * VdpPresentationQueueTarget are created using a \ref api_winsys
+ * specific API, such as \ref 
+ * VdpPresentationQueueTargetCreateX11. 
+ */
+typedef uint32_t VdpPresentationQueueTarget;
+
+/**
+ * \brief Destroy a VdpPresentationQueueTarget.
+ * \param[in] presentation_queue_target The target to destroy.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpPresentationQueueTargetDestroy(
+    VdpPresentationQueueTarget presentation_queue_target
+);
+
+/**
+ * \brief An opaque handle representing a presentation queue 
+ *        object.
+ */
+typedef uint32_t VdpPresentationQueue;
+
+/**
+ * \brief Create a VdpPresentationQueue.
+ * \param[in] device The device that will contain the queue. 
+ * \param[in] presentation_queue_target The location to display 
+ *       the content.
+ * \param[out] presentation_queue The new queue's handle.
+ * \return VdpStatus The completion status of the operation. 
+ *
+ * Note: The initial value for the background color will be set to
+ * an implementation-defined value.
+ */
+typedef VdpStatus VdpPresentationQueueCreate(
+    VdpDevice                  device,
+    VdpPresentationQueueTarget presentation_queue_target,
+    /* output parameters follow */
+    VdpPresentationQueue *     presentation_queue
+);
+
+/**
+ * \brief Destroy a VdpPresentationQueue.
+ * \param[in] presentation_queue The queue to destroy.
+ * \return VdpStatus The completion status of the operation.
+ */
+typedef VdpStatus VdpPresentationQueueDestroy(
+    VdpPresentationQueue presentation_queue
+);
+
+/**
+ * \brief Configure the background color setting.
+ * \param[in] presentation_queue The queue to manipulate. 
+ * \param[in] background_color The new background color. 
+ *  
+ * Note: Implementations may choose whether to apply the
+ * new background color value immediately, or defer it until
+ * the next surface is presented.
+ */
+typedef VdpStatus VdpPresentationQueueSetBackgroundColor(
+    VdpPresentationQueue presentation_queue,
+    VdpColor * const     background_color
+);
+
+/**
+ * \brief Retrieve the current background color setting.
+ * \param[in] presentation_queue The queue to query. 
+ * \param[out] background_color The current background color.
+ */
+typedef VdpStatus VdpPresentationQueueGetBackgroundColor(
+    VdpPresentationQueue presentation_queue,
+    VdpColor *           background_color
+);
+
+/**
+ * \brief Retrieve the presentation queue's "current" time. 
+ * \param[in] presentation_queue The queue to query. 
+ * \param[out] current_time The current time, which may 
+ *       represent a point between display VSYNC events.
+ * \return VdpStatus The completion status of the operation. 
+ */
+typedef VdpStatus VdpPresentationQueueGetTime(
+    VdpPresentationQueue presentation_queue,
+    /* output parameters follow */
+    VdpTime *            current_time
+);
+
+/**
+ * \brief Enter a surface into the presentation queue.
+ * \param[in] presentation_queue The queue to query.
+ * \param[in] surface The surface to enter into the queue.
+ * \param[in] clip_width If set to a non-zero value, the presentation queue
+ *       will display only clip_width pixels of the surface (anchored to the
+ *       top-left corner of the surface.
+ * \param[in] clip_height If set to a non-zero value, the presentation queue
+ *       will display only clip_height lines of the surface (anchored to the
+ *       top-left corner of the surface.
+ * \param[in] earliest_presentation_time The timestamp 
+ *       associated with the surface. The presentation queue
+ *       will not display the surface until the presentation
+ *       queue's current time is at least this value.
+ * \return VdpStatus The completion status of the operation. 
+ *
+ * Applications may choose to allow resizing of the presentation queue target
+ * (which may be e.g. a regular Window when using an X11-based
+ * implementation).
+ *
+ * \b clip_width and \b clip_height may be used to limit the size of the
+ * displayed region of a surface, in order to match the specific region that
+ * was rendered to.
+ *
+ * In turn, this allows the application to allocate over-sized (e.g.
+ * screen-sized) surfaces, but render to a region that matches the current
+ * size of the video window.
+ *
+ * Using this technique, an application's response to window resizing may
+ * simply be to render to, and display, a different region of the surface,
+ * rather than de-/re-allocation of surfaces to match the updated window size.
+ */ 
+typedef VdpStatus VdpPresentationQueueDisplay(
+    VdpPresentationQueue presentation_queue,
+    VdpOutputSurface     surface,
+    uint32_t             clip_width,
+    uint32_t             clip_height,
+    VdpTime              earliest_presentation_time
+);
+
+/**
+ * \brief Wait for a surface to finish being displayed.
+ * \param[in] presentation_queue The queue to query.
+ * \param[in] surface The surface to wait for. 
+ * \param[out] first_presentation_time The timestamp of the 
+ *       VSYNC at which this surface was first displayed. Note
+ *       that 0 means the surface was never displayed.
+ * \return VdpStatus The completion status of the operation. 
+ *  
+ * Note that this API will block indefinitely if queried about 
+ * the surface most recently added to a presentation queue, 
+ * since there is no other surface that could possibly replace 
+ * the queried surface.
+ */
+typedef VdpStatus VdpPresentationQueueBlockUntilSurfaceIdle(
+    VdpPresentationQueue presentation_queue,
+    VdpOutputSurface     surface,
+    /* output parameters follow */
+    VdpTime *            first_presentation_time
+);
+
+/** 
+ * \hideinitializer 
+ * \brief The status of a surface within a presentation queue.
+ */
+typedef enum {
+    /** The surface is no queued or currently visible. */
+    VDP_PRESENTATION_QUEUE_STATUS_IDLE,
+    /** The surface is in the queue, and not currently visible. */
+    VDP_PRESENTATION_QUEUE_STATUS_QUEUED,
+    /** The surface is the currently visible surface. */
+    VDP_PRESENTATION_QUEUE_STATUS_VISIBLE,
+} VdpPresentationQueueStatus;
+
+/**
+ * \brief Poll the current queue status of a surface.
+ * \param[in] presentation_queue The queue to query.
+ * \param[in] surface The surface to query. 
+ * \param[out] status The current status of the surface within 
+ *       the queue.
+ * \param[out] first_presentation_time The timestamp of the 
+ *       VSYNC at which this surface was first displayed. Note
+ *       that 0 means the surface was never displayed.
+ * \return VdpStatus The completion status of the operation. 
+ */
+typedef VdpStatus VdpPresentationQueueQuerySurfaceStatus(
+    VdpPresentationQueue         presentation_queue,
+    VdpOutputSurface             surface,
+    /* output parameters follow */
+    VdpPresentationQueueStatus * status,
+    VdpTime *                    first_presentation_time
+);
+
+/*@}*/
+
+/**
+ * \defgroup display_preemption Display Preemption 
+ *  
+ * The Window System may operate within a frame-work (such as 
+ * Linux's VT switching) where the display is shared between the 
+ * Window System (e.g. X) and some other output mechanism (e.g. 
+ * the VT.) Given this scenario, the Window System's control of 
+ * the display could be preempted, and restored, at any time. 
+ * 
+ * VDPAU does not mandate that implementations hide such 
+ * preemptions from VDPAU client applications; doing so may 
+ * impose extreme burdens upon VDPAU implementations. Equally, 
+ * however, implementations are free to hide such preemptions 
+ * from client applications. 
+ *  
+ * VDPAU allows implementations to inform the client application
+ * when such a preemption has occurred, and then refuse to 
+ * continue further operation. 
+ * 
+ * Similarly, some form of fatal hardware error could prevent further
+ * operation of the VDPAU implementation, without a complete
+ * re-initialization.
+ *
+ * The following discusses the behavior of implementations that 
+ * choose not to hide preemption from client applications. 
+ *  
+ * When preemption occurs, VDPAU internally destroys all 
+ * objects; the client application need not do this. However, if 
+ * the client application wishes to continue operation, it must 
+ * recreate all objects that it uses. It is probable that this 
+ * recreation will not succeed until the display ownership is 
+ * restored to the Window System. 
+ *  
+ * Once preemption has occurred, all VDPAU entry points will 
+ * return the specific error code \ref 
+ * VDP_STATUS_DISPLAY_PREEMPTED. 
+ *  
+ * VDPAU client applications may also be notified of such 
+ * preemptions and fatal errors via a callback. See \ref 
+ * VdpPreemptionCallbackRegister for more details. 
+ * 
+ * @{
+ */
+
+/**
+ * \brief A callback to notify the client application that a 
+ *        device's display has been preempted.
+ * \param[in] device The device that had its display preempted.
+ * \param[in] context The client-supplied callback context 
+ *       information.
+ * \return void No return value 
+ */
+typedef void VdpPreemptionCallback(
+    VdpDevice device,
+    void *   context
+);
+
+/**
+ * \brief Configure the display preemption callback.
+ * \param[in] device The device to be monitored for preemption. 
+ * \param[in] callback The client application's callback 
+ *       function. If NULL, the callback is unregistered.
+ * \param[in] context The client-supplied callback context 
+ *       information. This information will be passed to the
+ *       callback function if/when invoked.
+ * \return VdpStatus The completion status of the operation. 
+ */
+typedef VdpStatus VdpPreemptionCallbackRegister(
+    VdpDevice             device,
+    VdpPreemptionCallback callback,
+    void *               context
+);
+
+/*@}*/
+
+/**
+ * \defgroup get_proc_address Entry Point Retrieval
+ *  
+ * In order to facilitate multiple implementations of VDPAU
+ * co-existing within a single process, all functionality is
+ * available via function pointers. The mechanism to retrieve
+ * those function pointers is described below.
+ *  
+ * @{ 
+ */
+
+/** 
+ * \brief A type suitable for \ref VdpGetProcAddress 
+ *        "VdpGetProcAddress"'s \b function_id parameter.
+ */ 
+typedef uint32_t VdpFuncId;
+
+/** \hideinitializer */
+#define VDP_FUNC_ID_GET_ERROR_STRING                                            (VdpFuncId)0
+/** \hideinitializer */
+#define VDP_FUNC_ID_GET_PROC_ADDRESS                                            (VdpFuncId)1
+/** \hideinitializer */
+#define VDP_FUNC_ID_GET_API_VERSION                                             (VdpFuncId)2
+/** \hideinitializer */
+#define VDP_FUNC_ID_GET_INFORMATION_STRING                                      (VdpFuncId)4
+/** \hideinitializer */
+#define VDP_FUNC_ID_DEVICE_DESTROY                                              (VdpFuncId)5
+/** \hideinitializer */
+#define VDP_FUNC_ID_GENERATE_CSC_MATRIX                                         (VdpFuncId)6
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_SURFACE_QUERY_CAPABILITIES                            (VdpFuncId)7
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_SURFACE_QUERY_GET_PUT_BITS_Y_CB_CR_CAPABILITIES       (VdpFuncId)8
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_SURFACE_CREATE                                        (VdpFuncId)9
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_SURFACE_DESTROY                                       (VdpFuncId)10
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_SURFACE_GET_PARAMETERS                                (VdpFuncId)11
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_SURFACE_GET_BITS_Y_CB_CR                              (VdpFuncId)12
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR                              (VdpFuncId)13
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_CAPABILITIES                           (VdpFuncId)14
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_GET_PUT_BITS_NATIVE_CAPABILITIES       (VdpFuncId)15
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_PUT_BITS_INDEXED_CAPABILITIES          (VdpFuncId)16
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_PUT_BITS_Y_CB_CR_CAPABILITIES          (VdpFuncId)17
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_CREATE                                       (VdpFuncId)18
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_DESTROY                                      (VdpFuncId)19
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_GET_PARAMETERS                               (VdpFuncId)20
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_GET_BITS_NATIVE                              (VdpFuncId)21
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_PUT_BITS_NATIVE                              (VdpFuncId)22
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_PUT_BITS_INDEXED                             (VdpFuncId)23
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_PUT_BITS_Y_CB_CR                             (VdpFuncId)24
+/** \hideinitializer */
+#define VDP_FUNC_ID_BITMAP_SURFACE_QUERY_CAPABILITIES                           (VdpFuncId)25
+/** \hideinitializer */
+#define VDP_FUNC_ID_BITMAP_SURFACE_CREATE                                       (VdpFuncId)26
+/** \hideinitializer */
+#define VDP_FUNC_ID_BITMAP_SURFACE_DESTROY                                      (VdpFuncId)27
+/** \hideinitializer */
+#define VDP_FUNC_ID_BITMAP_SURFACE_GET_PARAMETERS                               (VdpFuncId)28
+/** \hideinitializer */
+#define VDP_FUNC_ID_BITMAP_SURFACE_PUT_BITS_NATIVE                              (VdpFuncId)29
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_OUTPUT_SURFACE                        (VdpFuncId)33
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_BITMAP_SURFACE                        (VdpFuncId)34
+/** \hideinitializer */
+#define VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_VIDEO_SURFACE_LUMA                    (VdpFuncId)35
+/** \hideinitializer */
+#define VDP_FUNC_ID_DECODER_QUERY_CAPABILITIES                                  (VdpFuncId)36
+/** \hideinitializer */
+#define VDP_FUNC_ID_DECODER_CREATE                                              (VdpFuncId)37
+/** \hideinitializer */
+#define VDP_FUNC_ID_DECODER_DESTROY                                             (VdpFuncId)38
+/** \hideinitializer */
+#define VDP_FUNC_ID_DECODER_GET_PARAMETERS                                      (VdpFuncId)39
+/** \hideinitializer */
+#define VDP_FUNC_ID_DECODER_RENDER                                              (VdpFuncId)40
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_QUERY_FEATURE_SUPPORT                           (VdpFuncId)41
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_QUERY_PARAMETER_SUPPORT                         (VdpFuncId)42
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_QUERY_ATTRIBUTE_SUPPORT                         (VdpFuncId)43
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_QUERY_PARAMETER_VALUE_RANGE                     (VdpFuncId)44
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_QUERY_ATTRIBUTE_VALUE_RANGE                     (VdpFuncId)45
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_CREATE                                          (VdpFuncId)46
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_SET_FEATURE_ENABLES                             (VdpFuncId)47
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_SET_ATTRIBUTE_VALUES                            (VdpFuncId)48
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_GET_FEATURE_SUPPORT                             (VdpFuncId)49
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_GET_FEATURE_ENABLES                             (VdpFuncId)50
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_GET_PARAMETER_VALUES                            (VdpFuncId)51
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_GET_ATTRIBUTE_VALUES                            (VdpFuncId)52
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_DESTROY                                         (VdpFuncId)53
+/** \hideinitializer */
+#define VDP_FUNC_ID_VIDEO_MIXER_RENDER                                          (VdpFuncId)54
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_TARGET_DESTROY                           (VdpFuncId)55
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_CREATE                                   (VdpFuncId)56
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_DESTROY                                  (VdpFuncId)57
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_SET_BACKGROUND_COLOR                     (VdpFuncId)58
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_GET_BACKGROUND_COLOR                     (VdpFuncId)59
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_GET_TIME                                 (VdpFuncId)62
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_DISPLAY                                  (VdpFuncId)63
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_BLOCK_UNTIL_SURFACE_IDLE                 (VdpFuncId)64
+/** \hideinitializer */
+#define VDP_FUNC_ID_PRESENTATION_QUEUE_QUERY_SURFACE_STATUS                     (VdpFuncId)65
+/** \hideinitializer */
+#define VDP_FUNC_ID_PREEMPTION_CALLBACK_REGISTER                                (VdpFuncId)66
+
+#define VDP_FUNC_ID_BASE_WINSYS 0x1000
+
+/** 
+ * \brief Retrieve a VDPAU function pointer.
+ * \param[in] device The device that the function will operate
+ *       against.
+ * \param[in] function_id The specific function to retrieve. 
+ * \param[out] function_pointer The actual pointer for the
+ *       application to call.
+ * \return VdpStatus The completion status of the operation. 
+ */
+typedef VdpStatus VdpGetProcAddress(
+    VdpDevice device,
+    VdpFuncId function_id,
+    /* output parameters follow */
+    void * *  function_pointer
+);
+
+/*@}*/
+/*@}*/
+
+/**
+ * \defgroup api_winsys Window System Integration Layer
+ *
+ * The set of VDPAU functionality specific to an individual
+ * Windowing System.
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
--- mplayer-1.0~rc3+svn20090426.orig/debian/prefs/mirrors
+++ mplayer-1.0~rc3+svn20090426/debian/prefs/mirrors
@@ -0,0 +1,7 @@
+http://www1.mplayerhq.hu/MPlayer/
+http://www2.mplayerhq.hu/MPlayer/
+http://www3.mplayerhq.hu/MPlayer/
+http://www4.mplayerhq.hu/MPlayer/
+http://www5.mplayerhq.hu/MPlayer/
+http://www7.mplayerhq.hu/MPlayer/
+http://www8.mplayerhq.hu/MPlayer/
--- mplayer-1.0~rc3+svn20090426.orig/debian/prefs/codecs_list
+++ mplayer-1.0~rc3+svn20090426/debian/prefs/codecs_list
@@ -0,0 +1,10 @@
+i386    @MAINSITE@ releases/codecs essential-20071007.tar.bz2
+powerpc @MAINSITE@ releases/codecs essential-ppc-20071007.tar.bz2
+amd64   @MAINSITE@ releases/codecs essential-amd64-20071007.tar.bz2
+alpha   @MAINSITE@ releases/codecs essential-alpha-20061028.tar.bz2
+
+
+
+
+
+
--- mplayer-1.0~rc3+svn20090426.orig/debian/prefs/MD5SUMS
+++ mplayer-1.0~rc3+svn20090426/debian/prefs/MD5SUMS
@@ -0,0 +1,34 @@
+cb4bb06ebc804f5dc4ec0ed516dc20d9  all-20061022.tar.bz2
+0407e8ad132e37ccd3f932448ca201c5  all-20071007.tar.bz2
+c71cbf23c9ac84b85a15801af6fe5fa4  all-alpha-20061028.tar.bz2
+7918b605cca3df7e2c34784f1328e494  all-ppc-20061022.tar.bz2
+abcf4a3abc16cf88c9df7e0a77e9b941  essential-20061022.tar.bz2
+4ea9c2dbd0945c83af1a8d0dd363993c  essential-20071007.tar.bz2
+96fe3d614650531dda6675124f986a13  essential-alpha-20061028.tar.bz2
+af409ba2918dc8f639dded805102fc76  essential-amd64-20061203.tar.bz2
+8e1ceeec51469f5baac65e56fac709e8  essential-amd64-20071007.tar.bz2
+df9ec99d9fa7ef0ab6a633cfb421d637  essential-ppc-20061022.tar.bz2
+6682d5013a91bb80fdde87a516f6a8af  essential-ppc-20071007.tar.bz2
+1f5b8e9d9e31f898b1207a0b3bd70f32  qt5dlls-20040626.tar.bz2
+dbb2e77156a69179473b86f7498e9b29  qt63dlls-20050115.tar.bz2
+9fb88417aef157e2f1f5b7be57eaed7b  qt65dlls-20040704.tar.bz2
+c8cc10f2c9f109fa44fc4dddb91571c4  qt6dlls-20040626.tar.bz2
+a7e750afda31796d322395d77c4184d0  qtextras-20041107.tar.bz2
+c9ae3969ba1e73a8cbeef38f5803fd2e  rp8codecs-20040626.tar.bz2
+32919658c4bdfb3454173e3d64d26dc2  rp8codecs-alpha-20050115.tar.bz2
+4cc9a6270f9aa834b4fef49d71b9faf9  rp8codecs-ppc-20050115.tar.bz2
+534658c867abb81c38e0c05bccc79a79  rp8codecs-win32-20040626.tar.bz2
+a32f4fa1f77593536a57e4b662fde7aa  rp9codecs-20050115.tar.bz2
+6b56c1c127f5ac0c4c8a9878f24477ca  rp9codecs-win32-20050115.tar.bz2
+4558d3690e9479b06df16d0a15b35f9d  unsupported-20040809.tar.bz2
+90ba6a76ded2f9fd9f865024bd8de3d3  win32codecs-20040703.tar.bz2
+58ce4d68001d4f39c3e84d52834fb3ef  win32codecs-essential-20040703.tar.bz2
+a7c980a1a94fbac6ebd34c7485a1891d  xanimdlls-20040626.tar.bz2
+0b4877ac52eb7e84eb3031e6d7a3f65d  xanimdlls-alpha-20061028.tar.bz2
+8965e5f67f39530f293fc6c594bca19a  xanimdlls-ppc-20040626.tar.bz2
+1e409d500336a8318cbe2a67bbf9d9ca  essential-macosx-x86-20060611.zip
+788cf4940280fd787c0a2141d88ce3c7  rp9codecs-macosx-20041107.pkg.zip
+1323e8d46bfc7b8d1d6d172018222e9c  windows-all-20061022.zip
+f96557eeddb4ea9d286a89ff8c91750a  windows-all-20071007.zip
+0cc375cebb4f7820ad82bc2802171193  windows-essential-20061022.zip
+e32bdc9970f0df7da8eb23d2b254b866  windows-essential-20071007.zip
--- mplayer-1.0~rc3+svn20090426.orig/debian/patches/22disable-xscreensaver.patch
+++ mplayer-1.0~rc3+svn20090426/debian/patches/22disable-xscreensaver.patch
@@ -0,0 +1,82 @@
+Author: <mennucc1@debian.org>
+Description: This patch avoids xscreensaver from blanking onto your favorite movie ; it was made by me, based on code posted in mplayer-dev-eng by Adam  Tlałka . It works as follows: when the cursor is inside the MPlayer window, and it is hidden, then the cursor is artificially moved  a bit every 10seconds (+-), so as to disable the screensaver. Of course, it would be a VERY bad idea to move aroundthe cursor when it is in another window (e.g. the user may end up clicking the wrong button)- so it does not work when the cursor is outside the MPlayer window.
+--- a/libvo/x11_common.c
++++ b/libvo/x11_common.c
+@@ -177,6 +177,9 @@ void vo_x11_ewmh_fullscreen(int action)
+     }
+ }
+ 
++static int pointer_is_hidden = 0;
++
++
+ void vo_hidecursor(Display * disp, Window win)
+ {
+     Cursor no_ptr;
+@@ -196,6 +199,7 @@ void vo_hidecursor(Display * disp, Windo
+     bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8);
+     no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0);
+     XDefineCursor(disp, win, no_ptr);
++    pointer_is_hidden = 1;
+     XFreeCursor(disp, no_ptr);
+     if (bm_no != None)
+         XFreePixmap(disp, bm_no);
+@@ -207,6 +211,7 @@ void vo_showcursor(Display * disp, Windo
+     if (WinID == 0)
+         return;
+     XDefineCursor(disp, win, 0);
++    pointer_is_hidden = 0;
+ }
+ 
+ static int x11_errorhandler(Display * display, XErrorEvent * event)
+@@ -805,6 +810,7 @@ void vo_x11_uninit(void)
+ 
+ static unsigned int mouse_timer;
+ static int mouse_waiting_hide;
++static int mouse_ignore_motion = 0;
+ 
+ int vo_x11_check_events(Display * mydisplay)
+ {
+@@ -878,7 +884,9 @@ int vo_x11_check_events(Display * mydisp
+                     sprintf(cmd_str,"set_mouse_pos %i %i",Event.xmotion.x, Event.xmotion.y);
+                     mp_input_queue_cmd(mp_input_parse_cmd(cmd_str));
+                 }
+-
++		if (mouse_ignore_motion)
++		  mouse_ignore_motion = 0;
++		else
+                 if (vo_mouse_autohide)
+                 {
+                     vo_showcursor(mydisplay, vo_window);
+@@ -1437,6 +1445,16 @@ void xscreensaver_heartbeat(void)
+ 
+         XResetScreenSaver(mDisplay);
+     }
++
++    static unsigned int last_warp_time = 0;
++    static int fake_move_distance = 16;
++    if (mDisplay &&  vo_window && pointer_is_hidden && (time - last_warp_time ) > 10000) {
++      last_warp_time = time;
++      mouse_ignore_motion = 1;
++      XWarpPointer(mDisplay,  vo_window, None, 0, 0, 0, 0, fake_move_distance, 0);
++      fake_move_distance = -fake_move_distance;
++      mp_msg(MSGT_VO, MSGL_DBG2, "Warping cursor to disable gnome-screensaver.\n");
++    }
+ }
+ 
+ static int xss_suspend(Bool suspend)
+--- a/DOCS/man/en/mplayer.1
++++ b/DOCS/man/en/mplayer.1
+@@ -3257,10 +3257,12 @@ Specify the screen width for video output drivers which
+ do not know the screen resolution like fbdev, x11 and TV-out.
+ .
+ .TP
+-.B \-stop\-xscreensaver (X11 only)
++.B \-stop\-xscreensaver (X11 , KDE and GNOME only)
+ Turns off xscreensaver at startup and turns it on again on exit.
++Note that the GNOME screensaver is disabled only as long
++as the mouse cursor is kept inside the MPlayer window.
+ If your screensaver supports neither the XSS nor XResetScreenSaver
+ API please use \-heartbeat\-cmd instead.
+ .
+ .TP
+ .B "\-vm \ \ \ "
--- mplayer-1.0~rc3+svn20090426.orig/debian/patches/23mplayer-debug-printf.patch
+++ mplayer-1.0~rc3+svn20090426/debian/patches/23mplayer-debug-printf.patch
@@ -0,0 +1,12 @@
+--- a/mplayer.c
++++ b/mplayer.c
+@@ -801,6 +801,9 @@ static void exit_sighandler(int x){
+       mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
+   default:
+       mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH);
++      printf(" [ This binary of MPlayer in Debian is currently compiled with\n"
++             "   '--enable-debug'; the debugging symbols are in the package\n"
++             "   'mplayer-dbg'.]\n");
+ #ifdef CONFIG_CRASH_DEBUG
+       if (crash_debug) {
+         int gdb_pid;
--- mplayer-1.0~rc3+svn20090426.orig/debian/patches/30_add_gmplayer_man_rules.diff
+++ mplayer-1.0~rc3+svn20090426/debian/patches/30_add_gmplayer_man_rules.diff
@@ -0,0 +1,38 @@
+enhance upstream Makefile to install gmplayer manpages
+
+the debian package used to install gmplayer symlinks with custom ln
+calls. It is way more convenient to implement this in the upstream
+Makefile.
+
+This patch should be ready to be applied upstream.
+
+diff --git a/Makefile b/Makefile
+index 263f3cd..f285283 100644
+--- a/Makefile
++++ b/Makefile
+@@ -899,6 +899,7 @@ install-gui: install-mplayer
+ 
+ install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
+ install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
++install-mplayer-gui-man: $(foreach lang,$(MAN_LANGS),install-mplayer-gui-man-$(lang))
+ 
+ install-mencoder-man-en: install-mplayer-man-en
+ 	cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
+@@ -918,8 +919,17 @@ install-mplayer-man-$(lang):
+ 	$(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/
+ endef
+ 
++define MPLAYER_GUI_MAN_RULE
++install-mplayer-gui-man-$(lang): install-mplayer-man-$(lang)
++	cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
++endef
++
++install-mplayer-gui-man-en: install-mplayer-man-en
++	cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
++
+ $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE)))
+ $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE)))
++$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_GUI_MAN_RULE)))
+ 
+ uninstall:
+ 	rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
--- mplayer-1.0~rc3+svn20090426.orig/debian/patches/40_improve_desktop_file.patch
+++ mplayer-1.0~rc3+svn20090426/debian/patches/40_improve_desktop_file.patch
@@ -0,0 +1,32 @@
+Author: Siegfried Gevatter <rainct@ubuntu.com>, Reinhard Tartler <siretart@tauware.de>
+Comment: improve file to conform (more) to the desktop file specification
+
+diff --git a/etc/mplayer.desktop b/etc/mplayer.desktop
+index 0ef3ce7..9f092c3 100644
+--- a/etc/mplayer.desktop
++++ b/etc/mplayer.desktop
+@@ -1,17 +1,18 @@
+ [Desktop Entry]
+ Type=Application
+-Encoding=UTF-8
+-Name=MPlayer
++Name=MPlayer Media Player
++Name[ca]=Reproductor multimèdia MPlayer
+ GenericName=Multimedia player
+-Comment=Multimedia player
+-Comment[de]=Multimedia-Player
+-Comment[es]=Reproductor multimedia
++Comment=Play movies and songs
++Comment[ca]=Reproduïu vídeos i cançons
++Comment[de]=Spiele Filme und Musik
++Comment[es]=Reproduzca vídeos y canciones
+ Comment[fr]=Lecteur multimédia
+ Comment[it]=Lettore multimediale
+ Comment[zh]=多媒体播放器
+ Icon=mplayer
+ TryExec=gmplayer
+-Exec=gmplayer %F
++Exec=gmplayer %F
+ Terminal=false
+ Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+ MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;
--- mplayer-1.0~rc3+svn20090426.orig/debian/patches/11configure-mktemp.patch
+++ mplayer-1.0~rc3+svn20090426/debian/patches/11configure-mktemp.patch
@@ -0,0 +1,15 @@
+Author: <debdev@pingu>
+Description: use mktemp for temp files
+--- a/configure
++++ b/configure
+@@ -1477,6 +1477,10 @@ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; d
+   test "$I" && break
+ done
+ 
++if which mktemp >/dev/null 2>/dev/null; then
++  # BSD/Debian/etc. mktemp avoids symlink attacks etc.
++  I=`mktemp -d "$I"/mplayer.XXXXXX` || exit 1
++fi
+ 
+ TMPLOG="configure.log"
+ TMPC="$I/mplayer-conf-$RANDOM-$$.c"
--- mplayer-1.0~rc3+svn20090426.orig/debian/patches/24_enable_fontconfig_by_default.diff
+++ mplayer-1.0~rc3+svn20090426/debian/patches/24_enable_fontconfig_by_default.diff
@@ -0,0 +1,28 @@
+Enable fontconfig support by default.
+
+taken from upstream:
+
+------------------------------------------------------------------------
+r29370 | siretart | 2009-06-17 11:16:19 +0200 (Mi, 17. Jun 2009) | 8 lines
+
+Enable fontconfig support by default. This change takes only in effect,
+if fontconfig support is actually compiled in. If freetype is not
+enabled, this patch should have no effect as well.
+
+The visible result of this patch is to avoid the warning about a missing
+~/.mplayer/subfont.ttf when starting mplayer (or gmplayer) without
+parameters, like done from the .desktop file.
+
+------------------------------------------------------------------------
+
+--- mplayer.orig/libvo/font_load_ft.c
++++ mplayer/libvo/font_load_ft.c
+@@ -71,7 +71,7 @@
+ int force_load_font;
+ 
+ int using_freetype = 0;
+-int font_fontconfig = 0;
++int font_fontconfig = 1;
+ 
+ //// constants
+ static unsigned int const colors = 256;
--- mplayer-1.0~rc3+svn20090426.orig/debian/patches/series
+++ mplayer-1.0~rc3+svn20090426/debian/patches/series
@@ -0,0 +1,7 @@
+11configure-mktemp.patch
+22disable-xscreensaver.patch
+23mplayer-debug-printf.patch
+24_enable_fontconfig_by_default.diff
+30_add_gmplayer_man_rules.diff
+40_improve_desktop_file.patch
+50_fix_initial_volume_setting_pulse_output.patch
--- mplayer-1.0~rc3+svn20090426.orig/debian/patches/50_fix_initial_volume_setting_pulse_output.patch
+++ mplayer-1.0~rc3+svn20090426/debian/patches/50_fix_initial_volume_setting_pulse_output.patch
@@ -0,0 +1,16 @@
+Author: Marcus Blumhagen <marcus.blumhagen@web.de>
+Comment: Fixes LP: #482408 where the stream volume would erroneously be set to max for each new mplayer invocation
+
+Index: mplayer-1.0~rc3+svn20090426/libao2/ao_pulse.c
+===================================================================
+--- mplayer-1.0~rc3+svn20090426.orig/libao2/ao_pulse.c	2009-11-18 19:31:12.000000000 -0500
++++ mplayer-1.0~rc3+svn20090426/libao2/ao_pulse.c	2009-11-18 19:31:54.000000000 -0500
+@@ -221,7 +221,7 @@
+     pa_stream_set_write_callback(stream, stream_request_cb, NULL);
+     pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL);
+ 
+-    if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, &volume, NULL) < 0)
++    if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0)
+         goto unlock_and_fail;
+ 
+     /* Wait until the stream is ready */