Revision: 32804
http://xbmc.svn.sourceforge.net/xbmc/?rev=32804&view=rev
Author: spiff_
Date: 2010-08-15 20:40:17 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
fixed: ticket #9882 - muddled ifdefs in DVDAudioCodecPassthrough.cpp. thanks to exobuzz
(cherry picked from commit a811c8f0937dfefed3091573786e9c4e7e2829b5)
Modified Paths:
--------------
branches/Dharma/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
Modified: branches/Dharma/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
===================================================================
--- branches/Dharma/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp 2010-08-15 20:39:02 UTC (rev 32803)
+++ branches/Dharma/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp 2010-08-15 20:40:17 UTC (rev 32804)
@@ -207,7 +207,7 @@
/* try AC3/DTS decoders first */
m_Codec = hints.codec;
-#ifdef USE_LIBDTS_DECODER
+#ifdef USE_LIBA52_DECODER
if(m_Codec == CODEC_ID_AC3)
{
if (!m_dllA52.Load())
@@ -219,7 +219,7 @@
return true;
}
#endif
-#ifdef USE_LIBAC3_DECODER
+#ifdef USE_LIBDTS_DECODER
if(m_Codec == CODEC_ID_DTS)
{
if (!m_dllDTS.Load())
@@ -370,14 +370,14 @@
if(!frame)
return len;
-#ifdef USE_LIBDTS_DECODER
+#ifdef USE_LIBA52_DECODER
if(m_Codec == CODEC_ID_AC3)
{
m_OutputSize = PaddAC3Data(frame, framesize, m_OutputBuffer);
return len;
}
#endif
-#ifdef USE_LIBAC3_DECODER
+#ifdef USE_LIBDTS_DECODER
if(m_Codec == CODEC_ID_DTS)
{
m_OutputSize = PaddDTSData(frame, framesize, m_OutputBuffer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|