svn merge -r 26090:26141 https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/
authorbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 28 Dec 2009 22:52:39 +0000 (22:52 +0000)
committerbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 28 Dec 2009 22:52:39 +0000 (22:52 +0000)
commit2ca34c9ddf248a7ac28f1a63291fe052cd0faa0b
treef0960827977a951327d5bad275c5b6cfb52b66cd
parent7f15e7d780a73608256a79ad7a1052467a93e183
svn merge -r 26090:26141 https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/boblight@26144 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
42 files changed:
XBMC.xcodeproj/project.pbxproj
guilib/AudioContext.cpp
guilib/AudioContext.h
guilib/GUIAudioManager.cpp
guilib/GUIAudioManager.h
project/VS2008Express/XBMC.vcproj
project/Win32BuildSetup/dependencies/vcredist_x86.exe
skin/Confluence/720p/DialogFullScreenInfo.xml
skin/Confluence/720p/Home.xml
skin/Confluence/720p/MusicOSD.xml
skin/Confluence/720p/MusicOSDVisSettings.xml
skin/Confluence/720p/MusicVisualisation.xml
skin/Confluence/720p/VideoOSD.xml
skin/Confluence/720p/VideoOSDBookmarks.xml
skin/Confluence/720p/VideoOSDSettings.xml
skin/Confluence/720p/VisualisationPresetList.xml
skin/Confluence/720p/custom_DiscDialog_1113.xml
skin/Confluence/720p/custom_SkinSetting_1111.xml
skin/Confluence/language/English/strings.xml
skin/Confluence/media/OSDSubtitlesFO.png [new file with mode: 0644]
skin/Confluence/media/OSDSubtitlesNF.png [new file with mode: 0644]
xbmc/Application.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/cores/AudioRenderers/AudioRendererFactory.cpp
xbmc/cores/AudioRenderers/Win32ChannelRemap.cpp [new file with mode: 0644]
xbmc/cores/AudioRenderers/Win32ChannelRemap.h [new file with mode: 0644]
xbmc/cores/AudioRenderers/Win32DirectSound.cpp
xbmc/cores/AudioRenderers/Win32DirectSound.h
xbmc/cores/AudioRenderers/Win32WASAPI.cpp [new file with mode: 0644]
xbmc/cores/AudioRenderers/Win32WASAPI.h [new file with mode: 0644]
xbmc/cores/VideoRenderers/RenderManager.cpp
xbmc/cores/dvdplayer/Codecs/ffmpeg/configure
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vdpau.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vdpau.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
xbmc/cores/paplayer/PAPlayer.cpp
xbmc/lib/libPython/XBPyThread.cpp
xbmc/win32/WIN32XBPythonDll.cpp
xbmc/win32/XBMC_PC.cpp