changed: merged some other stuff back from linux branch to ease merging
authorelupus <elupus@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 8 Aug 2007 19:15:22 +0000 (19:15 +0000)
committerelupus <elupus@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 8 Aug 2007 19:15:22 +0000 (19:15 +0000)
commitc80b1d306947961f79dbe34bb66953d8d5b93cb2
treea8b8e4a3e358967d6ba239f0774f9ff20f1530dc
parentf8907f42bedfee94aaa79a1e2dbc09928c40bc00
changed: merged some other stuff back from linux branch to ease merging

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/XBMC@9856 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
47 files changed:
xbmc/cores/dvdplayer/DVDAudio.cpp
xbmc/cores/dvdplayer/DVDClock.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibDts.h
xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLiba52.h
xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h
xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.cpp
xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
xbmc/cores/dvdplayer/DVDDemuxSPU.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.h
xbmc/cores/dvdplayer/DVDMessageQueue.cpp
xbmc/cores/dvdplayer/DVDMessageQueue.h
xbmc/cores/dvdplayer/DVDMessageTracker.cpp
xbmc/cores/dvdplayer/DVDOverlayContainer.cpp
xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp
xbmc/cores/dvdplayer/DVDPerformanceCounter.cpp
xbmc/cores/dvdplayer/DVDPerformanceCounter.h
xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
xbmc/cores/dvdplayer/DVDPlayerAudio.h
xbmc/cores/dvdplayer/DVDPlayerSubtitle.h
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.h
xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.h
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h