merged: changes from trunk. revs: r30868:31000
authoralwinus <alwinus@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 6 Aug 2010 13:28:15 +0000 (13:28 +0000)
committeralwinus <alwinus@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 6 Aug 2010 13:28:15 +0000 (13:28 +0000)
commitffbf4494b09c1c7b038bd81ea11ab8c012765ae6
tree88fc53ff467ec3f1c420c649655c1e76b1a52b38
parent8fb1b376470adfb5b21b8cbaa18e065464e82408
merged: changes from trunk. revs: r30868:31000

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2@32539 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
236 files changed:
Makefile.in
Makefile.include.in
XBMC.xcodeproj/project.pbxproj
addons/metadata.themoviedb.org/addon.xml
addons/metadata.themoviedb.org/changelog.txt [new file with mode: 0644]
addons/metadata.themoviedb.org/tmdb.xml
addons/metadata.tvdb.com/addon.xml
addons/metadata.tvdb.com/resources/language/Finnish/strings.xml [new file with mode: 0644]
addons/metadata.tvdb.com/resources/settings.xml [new file with mode: 0644]
addons/metadata.tvdb.com/tvdb.xml
addons/repository.xbmc.org/addon.xml [new file with mode: 0644]
addons/repository.xbmc.org/icon.png [new file with mode: 0644]
addons/skin.confluence/720p/DialogAddonInfo.xml
addons/skin.confluence/720p/DialogButtonMenu.xml
addons/skin.confluence/720p/DialogSelect.xml
addons/skin.confluence/720p/Home.xml
addons/skin.confluence/build.bat
addons/skin.confluence/language/German/strings.xml
addons/skin.confluence/media/DefaultAddon.png [new file with mode: 0644]
addons/skin.confluence/media/DefaultAddonNone.png [new file with mode: 0644]
addons/skin.confluence/media/Makefile
addons/visualization.dxspectrum/resources/language/Finnish/strings.xml [new file with mode: 0644]
configure.in
docs/manpages/xbmc.bin.1
guilib/GUIListGroup.cpp
guilib/GUITexture.cpp
guilib/GUITexture.h
guilib/GUITextureD3D.cpp
guilib/GUITextureD3D.h
guilib/GUITextureGL.cpp
guilib/GUITextureGL.h
guilib/GUITextureGLES.cpp
guilib/GUITextureGLES.h
guilib/GUIWindow.cpp
guilib/GUIWindow.h
guilib/GUIWindowManager.cpp
guilib/GUIWindowManager.h
guilib/common/LIRC.cpp
guilib/system.h
language/English/strings.xml
project/BuildDependencies/scripts/libcurl_d.bat
project/BuildDependencies/scripts/libcurl_d.txt
project/Win32BuildSetup/BuildSetup.bat
system/players/dvdplayer/avcodec-52.dll
system/players/dvdplayer/avformat-52.dll
system/players/dvdplayer/avutil-50.dll
system/players/dvdplayer/postproc-51.dll
system/players/dvdplayer/swscale-0.6.1.dll
tools/EventClients/Makefile
tools/Linux/packaging/debian/control
tools/Linux/packaging/debian/control.in
tools/Linux/packaging/debian/xbmc-skin-pm3-hd.install [deleted file]
tools/Linux/packaging/debian/xbmc-skin-pm3-hd.links [deleted file]
tools/Linux/xbmc.sh.in
tools/XBMCLive/SDK/buildDEBs/build-installer.sh.lucid-variant
tools/XBMCLive/SDK/buildDEBs/build-live-initramfs.sh
tools/XBMCLive/SDK/buildWithOptions.sh
tools/XBMCLive/SDK/copyFiles-initramfs.sh
tools/XBMCLive/SDK/copyFiles-installer.sh.lucid-variant
tools/XBMCLive/diskmounter
web/poc_jsonrpc/albums.html
web/poc_jsonrpc/artists.html
web/poc_jsonrpc/development.html
web/poc_jsonrpc/index.html
web/poc_jsonrpc/movies.html
web/poc_jsonrpc/musicfiles.html
web/poc_jsonrpc/nowplaying.html
web/poc_jsonrpc/tvshowepisodes.html
web/poc_jsonrpc/tvshows.html
web/poc_jsonrpc/tvshowseasons.html
web/poc_jsonrpc/videofiles.html
xbmc/AdvancedSettings.cpp
xbmc/AdvancedSettings.h
xbmc/Application.cpp
xbmc/Application.h
xbmc/Database.cpp
xbmc/FileSystem/AddonsDirectory.cpp
xbmc/FileSystem/FileCurl.cpp
xbmc/FileSystem/PluginDirectory.cpp
xbmc/GUIDialogAddonInfo.cpp
xbmc/GUIDialogAddonInfo.h
xbmc/GUIDialogAddonSettings.cpp
xbmc/GUIDialogAddonSettings.h
xbmc/GUIDialogContentSettings.cpp
xbmc/GUIDialogMusicOSD.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUISettings.cpp
xbmc/GUIWindowAddonBrowser.cpp
xbmc/GUIWindowAddonBrowser.h
xbmc/GUIWindowFileManager.cpp
xbmc/GUIWindowFullScreen.h
xbmc/GUIWindowMusicInfo.cpp
xbmc/GUIWindowMusicInfo.h
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoFiles.cpp
xbmc/MusicDatabase.cpp
xbmc/NfoFile.cpp
xbmc/RenderSystemDX.cpp
xbmc/VideoDatabase.cpp
xbmc/VideoDatabase.h
xbmc/VideoInfoScanner.cpp
xbmc/VideoInfoScanner.h
xbmc/WinEventsWin32.cpp
xbmc/WinSystemWin32.cpp
xbmc/WinSystemWin32.h
xbmc/addons/Addon.cpp
xbmc/addons/Addon.h
xbmc/addons/AddonDll.h
xbmc/addons/AddonStatusHandler.cpp
xbmc/addons/IAddon.h
xbmc/addons/Scraper.cpp
xbmc/addons/Scraper.h
xbmc/addons/ScreenSaver.cpp
xbmc/addons/ScreenSaver.h
xbmc/cores/AudioRenderers/Win32WASAPI.cpp
xbmc/cores/dvdplayer/Codecs/Makefile.in
xbmc/cores/dvdplayer/Codecs/_ffmpeg_with_libvpx_win32.txt [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/Changelog
xbmc/cores/dvdplayer/Codecs/ffmpeg/LICENSE
xbmc/cores/dvdplayer/Codecs/ffmpeg/MAINTAINERS
xbmc/cores/dvdplayer/Codecs/ffmpeg/Makefile
xbmc/cores/dvdplayer/Codecs/ffmpeg/configure
xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/APIchanges
xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffmpeg-doc.texi
xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffplay-doc.texi
xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffprobe-doc.texi
xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffserver-doc.texi
xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/general.texi
xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/texi2pod.pl
xbmc/cores/dvdplayer/Codecs/ffmpeg/ffmpeg.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/ffserver.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/Makefile
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac.c [deleted file]
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aacdec.c [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aacenc.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aacsbr.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/allcodecs.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/asm-offsets.h [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/h264dsp_init_arm.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/h264pred_init_arm.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/mpegvideo_arm.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/mpegvideo_neon.S
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eval.c [deleted file]
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eval.h [deleted file]
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imgconvert.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libtheoraenc.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libvorbis.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libvpxenc.c [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libx264.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiodec.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/opt.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ratecontrol.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ratecontrol.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/raw.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rawdec.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sbr.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vorbis_enc.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx_avg_template.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/Makefile
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avformat.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/gxf.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/http.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/httpauth.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/isom.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskaenc.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/metadata.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/movenc.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nut.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nutenc.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/os_support.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/riff.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rmdec.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpdec_h264.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtsp.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtsp.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtspenc.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/utils.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/Makefile
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/avutil.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/base64.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/base64.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/eval.c [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/eval.h [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/pixfmt.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/codec-regression.sh
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/lavfi-regression.sh
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/acodec/pcm
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/lavf/mkv
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/seek/lavf.mkv.ref
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/seek/rgb.avi.ref [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/seek/yuv.avi.ref [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/vsynth1/rgb/rgb.vsynth1.regression [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/vsynth1/yuv/yuv.vsynth1.regression [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/vsynth2/rgb/rgb.vsynth2.regression [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ref/vsynth2/yuv/yuv.vsynth2.regression [new file with mode: 0644]
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h
xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp
xbmc/cores/paplayer/AC3CDDACodec.cpp
xbmc/cores/paplayer/AC3CDDACodec.h
xbmc/cores/paplayer/AC3Codec.cpp
xbmc/cores/paplayer/AC3Codec.h
xbmc/cores/paplayer/CodecFactory.cpp
xbmc/cores/paplayer/DTSCDDACodec.cpp
xbmc/cores/paplayer/DTSCDDACodec.h
xbmc/cores/paplayer/DTSCodec.cpp
xbmc/cores/paplayer/DTSCodec.h
xbmc/cores/paplayer/DVDPlayerCodec.cpp
xbmc/cores/paplayer/DVDPlayerCodec.h
xbmc/cores/paplayer/DllAc3codec.h
xbmc/cores/paplayer/DllDCACodec.h
xbmc/lib/libPython/XBPythonDll.cpp
xbmc/lib/libPython/XBPythonDllFuncs.S
xbmc/lib/libPython/xbmcmodule/PythonAddon.cpp
xbmc/lib/libPython/xbmcmodule/PythonAddon.h
xbmc/lib/libhttpapi/XBMChttp.cpp
xbmc/linux/PlatformDefs.h
xbmc/utils/Builtins.cpp
xbmc/utils/HTMLUtil.cpp
xbmc/utils/HTMLUtil.h
xbmc/utils/MusicInfoScraper.cpp
xbmc/utils/ScraperParser.cpp
xbmc/utils/ScraperUrl.cpp
xbmc/utils/ScraperUrl.h
xbmc/win32/WIN32Util.cpp
xbmc/win32/WIN32Util.h
xbmc/win32/Win32StorageProvider.cpp
xbmc/xbmc.cpp