[SCM] mplayer/master.experimental: Merge branch 'upstream' into master.experimental

[siretart at users.alioth.debian.org]

Imported Upstream version 1.0~svn33713
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.experimental
X-Git-Reftype: branch
X-Git-Oldrev: 7d28728f8862249159c62e174c073ff5dbc86d71
X-Git-Newrev: 9d4bc7c2d0abf0c12f4c83e24d1006d5caf1df96

The following commit has been merged in the master.experimental branch:
commit 3212d6e96b5cdd46c1d3ac932859ed6485f06735
Merge: d84fb7ea1a084a7e17255d7c68f27bf5773134fd 4d502685189aca67f4f6640a71afac033a0d33c6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 25 09:04:50 2011 +0200

    Merge branch 'upstream' into master.experimental
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index 845ca06,b57c654..52d91b7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,54 +1,55 @@@
 +.pc
+ *.[od]
+ *.exe
+ *.ho
+ codec-cfg
+ codec-cfg-test
+ codecs2html
+ codecs.conf.h
+ config.*
+ cpuinfo
+ gmplayer
+ help_mp.h
+ mencoder
+ mplayer
+ tags
+ TAGS
+ version.h
+ debian/changelog
+ debian/*.debhelper.log
+ DOCS/codecs-status.html
+ DOCS/HTML/
+ DOCS/HTML-single/
+ DOCS/tech/doxygen
+ DOCS/xml/html-chunk.xsl
+ DOCS/xml/html-single.xsl
+ DOCS/xml/xml.mak
+ DOCS/xml/*/main.xml
+ drivers/mga_vid_test
+ drivers/tdfx_vid_test
+ ffmpeg/
+ libdvdnav/
+ libdvdread4/
+ libvo/aspecttest
+ loader/qtx/list
+ loader/qtx/qtxload
+ mp3lib/test
+ mp3lib/test2
+ TOOLS/alaw-gen
+ TOOLS/alaw.dat
+ TOOLS/alaw.out
+ TOOLS/asfinfo
+ TOOLS/avi-fix
+ TOOLS/avisubdump
+ TOOLS/bmovl-test
+ TOOLS/compare
+ TOOLS/cpuinfo
+ TOOLS/dump_mp4
+ TOOLS/fastmemcpybench
+ TOOLS/modify_reg
+ TOOLS/movinfo
+ TOOLS/netstream
+ TOOLS/subrip
+ TOOLS/vivodump
+ vidix/pci_*.[ch]
+ vidix/dhahelperwin/dhahelper.sys

-- 
mplayer packaging