[osx] drop CDVDAudioCodecPassthroughFFmpeg - it was broken in 4f74e67f2f anyway

7 files changed, 0 insertions, 789 deletions

diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index c3e8eb2c0d..8e5fe7eced 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -827,7 +827,6 @@
 		DFF0F15917528350002DA3A4 /* DVDAudioCodecLibMad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */; };
 		DFF0F15A17528350002DA3A4 /* DVDAudioCodecLPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */; };
 		DFF0F15B17528350002DA3A4 /* DVDAudioCodecPassthrough.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB6610615374E80006B8FF1 /* DVDAudioCodecPassthrough.cpp */; };
-		DFF0F15C17528350002DA3A4 /* DVDAudioCodecPassthroughFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F245D81112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.cpp */; };
 		DFF0F15D17528350002DA3A4 /* DVDAudioCodecPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15150D25F9F900618676 /* DVDAudioCodecPcm.cpp */; };
 		DFF0F15E17528350002DA3A4 /* DVDOverlayCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDA3152160E34230047A626 /* DVDOverlayCodec.cpp */; };
 		DFF0F15F17528350002DA3A4 /* DVDOverlayCodecCC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E152B0D25F9F900618676 /* DVDOverlayCodecCC.cpp */; };
@@ -2236,7 +2235,6 @@
 		E49911C1174E5D2500741B6D /* DVDAudioCodecLibMad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */; };
 		E49911C2174E5D2500741B6D /* DVDAudioCodecLPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */; };
 		E49911C3174E5D2500741B6D /* DVDAudioCodecPassthrough.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFB6610615374E80006B8FF1 /* DVDAudioCodecPassthrough.cpp */; };
-		E49911C4174E5D2500741B6D /* DVDAudioCodecPassthroughFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F245D81112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.cpp */; };
 		E49911C5174E5D2500741B6D /* DVDAudioCodecPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15150D25F9F900618676 /* DVDAudioCodecPcm.cpp */; };
 		E49911C6174E5D2500741B6D /* DVDOverlayCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDA3152160E34230047A626 /* DVDOverlayCodec.cpp */; };
 		E49911C7174E5D2500741B6D /* DVDOverlayCodecCC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E152B0D25F9F900618676 /* DVDOverlayCodecCC.cpp */; };
@@ -3221,7 +3219,6 @@
 		F5EDC48C1651A6F900B852D8 /* GroupUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5EDC48A1651A6F900B852D8 /* GroupUtils.cpp */; };
 		F5F240EF110A4F76009126C6 /* CrystalHD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F240EB110A4F76009126C6 /* CrystalHD.cpp */; };
 		F5F244651110DC6B009126C6 /* FileOperationJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F244641110DC6B009126C6 /* FileOperationJob.cpp */; };
-		F5F245DA1112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F245D81112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.cpp */; };
 		F5F245EE1112C9AB009126C6 /* FileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F245EC1112C9AB009126C6 /* FileUtils.cpp */; };
 		F5F2EF4B0E593E0D0092C37F /* DVDFileInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F2EF4A0E593E0D0092C37F /* DVDFileInfo.cpp */; };
 		F5F8E1DA0E427E8000A8E96F /* VGMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5F8E1D90E427E8000A8E96F /* VGMCodec.cpp */; };
@@ -5641,8 +5638,6 @@
 		F5F240EC110A4F76009126C6 /* CrystalHD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrystalHD.h; sourceTree = "<group>"; };
 		F5F244631110DC6B009126C6 /* FileOperationJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileOperationJob.h; sourceTree = "<group>"; };
 		F5F244641110DC6B009126C6 /* FileOperationJob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileOperationJob.cpp; sourceTree = "<group>"; };
-		F5F245D81112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDAudioCodecPassthroughFFmpeg.cpp; sourceTree = "<group>"; };
-		F5F245D91112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDAudioCodecPassthroughFFmpeg.h; sourceTree = "<group>"; };
 		F5F245EC1112C9AB009126C6 /* FileUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUtils.cpp; sourceTree = "<group>"; };
 		F5F245ED1112C9AB009126C6 /* FileUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUtils.h; sourceTree = "<group>"; };
 		F5F2EF490E593E0D0092C37F /* DVDFileInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DVDFileInfo.h; sourceTree = "<group>"; };
@@ -7624,8 +7619,6 @@
 				E38E15120D25F9F900618676 /* DVDAudioCodecLPcm.h */,
 				DFB6610615374E80006B8FF1 /* DVDAudioCodecPassthrough.cpp */,
 				DFB6610715374E80006B8FF1 /* DVDAudioCodecPassthrough.h */,
-				F5F245D81112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.cpp */,
-				F5F245D91112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.h */,
 				E38E15150D25F9F900618676 /* DVDAudioCodecPcm.cpp */,
 				E38E15160D25F9F900618676 /* DVDAudioCodecPcm.h */,
 			);
@@ -10300,7 +10293,6 @@
 				F5DC8801110A46C700EE1B15 /* ModplugCodec.cpp in Sources */,
 				F5F240EF110A4F76009126C6 /* CrystalHD.cpp in Sources */,
 				F5F244651110DC6B009126C6 /* FileOperationJob.cpp in Sources */,
-				F5F245DA1112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.cpp in Sources */,
 				F5F245EE1112C9AB009126C6 /* FileUtils.cpp in Sources */,
 				F5A7A702112893E50059D6AA /* AnnouncementManager.cpp in Sources */,
 				F5A7A85B112908F00059D6AA /* WebServer.cpp in Sources */,
@@ -11005,7 +10997,6 @@
 				DFF0F15917528350002DA3A4 /* DVDAudioCodecLibMad.cpp in Sources */,
 				DFF0F15A17528350002DA3A4 /* DVDAudioCodecLPcm.cpp in Sources */,
 				DFF0F15B17528350002DA3A4 /* DVDAudioCodecPassthrough.cpp in Sources */,
-				DFF0F15C17528350002DA3A4 /* DVDAudioCodecPassthroughFFmpeg.cpp in Sources */,
 				DFF0F15D17528350002DA3A4 /* DVDAudioCodecPcm.cpp in Sources */,
 				DFF0F15E17528350002DA3A4 /* DVDOverlayCodec.cpp in Sources */,
 				DFF0F15F17528350002DA3A4 /* DVDOverlayCodecCC.cpp in Sources */,
@@ -12064,7 +12055,6 @@
 				E49911C1174E5D2500741B6D /* DVDAudioCodecLibMad.cpp in Sources */,
 				E49911C2174E5D2500741B6D /* DVDAudioCodecLPcm.cpp in Sources */,
 				E49911C3174E5D2500741B6D /* DVDAudioCodecPassthrough.cpp in Sources */,
-				E49911C4174E5D2500741B6D /* DVDAudioCodecPassthroughFFmpeg.cpp in Sources */,
 				E49911C5174E5D2500741B6D /* DVDAudioCodecPcm.cpp in Sources */,
 				E49911C6174E5D2500741B6D /* DVDOverlayCodec.cpp in Sources */,
 				E49911C7174E5D2500741B6D /* DVDOverlayCodecCC.cpp in Sources */,
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index c5ede9b6f5..adc3f99374 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -1737,7 +1737,6 @@
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLibMad.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLPcm.cpp" />
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthroughFFmpeg.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPcm.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecCrystalHD.cpp" />
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodecFFmpeg.cpp" />
@@ -2528,7 +2527,6 @@
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecFFmpeg.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLibMad.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLPcm.h" />
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthroughFFmpeg.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPcm.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DllLibMpeg2.h" />
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\DVDVideoCodec.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index cec4333ca5..f994d65f96 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -405,9 +405,6 @@
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLPcm.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthroughFFmpeg.cpp">
-      <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPcm.cpp">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClCompile>
@@ -3223,9 +3220,6 @@
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecLPcm.h">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPassthroughFFmpeg.h">
-      <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Audio\DVDAudioCodecPcm.h">
       <Filter>cores\dvdplayer\DVDCodecs\Audio</Filter>
     </ClInclude>
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
deleted file mode 100644
index f49b5b5a7f..0000000000
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
+++ /dev/null
@@ -1,648 +0,0 @@
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "DVDAudioCodecPassthroughFFmpeg.h"
-#include "DVDCodecs/DVDCodecs.h"
-#include "DVDStreamInfo.h"
-#include "cores/AudioEngine/Utils/AEUtil.h"
-#include "settings/MediaSettings.h"
-#include "settings/Settings.h"
-#include "utils/log.h"
-#include "cores/AudioEngine/AEFactory.h"
-
-//These values are forced to allow spdif out
-#define OUT_SAMPLESIZE 16
-#define OUT_CHANNELS   2
-#define OUT_SAMPLERATE 48000
-
-/* Lookup tables */
-static const uint16_t AC3Bitrates[] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640};
-static const uint16_t AC3FSCod   [] = {48000, 44100, 32000, 0};
-
-static const uint16_t DTSFSCod   [] = {0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0, 12000, 24000, 48000, 0, 0};
-
-#define NULL_MUXER(muxer) \
-  muxer.m_pFormat    = NULL; \
-  muxer.m_pStream    = NULL; \
-  muxer.m_OutputSize = 0; \
-  muxer.m_Consumed   = 0; \
-  muxer.m_Buffer     = NULL; \
-  muxer.m_BufferSize = 0;
-
-CDVDAudioCodecPassthroughFFmpeg::CDVDAudioCodecPassthroughFFmpeg(void)
-{
-  NULL_MUXER(m_SPDIF);
-  NULL_MUXER(m_ADTS );
-
-  m_pSyncFrame   = NULL;
-  m_Needed       = 0;
-  m_NeededUsed   = 0;
-  m_SampleRate   = 0;
-
-  m_Codec        = NULL;
-
-  /* make enough room for at-least two audio frames */
-  m_DecodeSize   = 0;
-  m_DecodeBuffer = NULL;
-  m_bSupportsAC3Out = false;
-  m_bSupportsDTSOut = false;
-  m_bSupportsAACOut = false;
-  m_LostSync = false;
-  
-}
-
-CDVDAudioCodecPassthroughFFmpeg::~CDVDAudioCodecPassthroughFFmpeg(void)
-{
-  Dispose();
-}
-
-/*===================== MUXER FUNCTIONS ========================*/
-bool CDVDAudioCodecPassthroughFFmpeg::SetupMuxer(CDVDStreamInfo &hints, CStdString muxerName, Muxer &muxer)
-{
-  CLog::Log(LOGINFO, "CDVDAudioCodecPassthroughFFmpeg::SetupMuxer - Trying to setup %s muxer", muxerName.c_str());
-
-  /* get the muxer */
-  AVOutputFormat *fOut = NULL;
-
-  fOut = m_dllAvFormat.av_guess_format(muxerName.c_str(), NULL, NULL);
-  if (!fOut)
-  {
-    CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::SetupMuxer - Failed to get the FFmpeg %s muxer", muxerName.c_str());
-    Dispose();
-    return false;
-  }
-
-  /* allocate a the format context */
-  muxer.m_pFormat = m_dllAvFormat.avformat_alloc_context();
-  if (!muxer.m_pFormat)
-  {
-    CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::SetupMuxer - Failed to allocate AVFormat context");
-    Dispose();
-    return false;
-  }
-
-  muxer.m_pFormat->oformat = fOut;
-
-  /* allocate a put_byte struct so we can grab the output */
-  muxer.m_pFormat->pb = m_dllAvFormat.avio_alloc_context(muxer.m_BCBuffer, sizeof(muxer.m_BCBuffer), AVIO_FLAG_READ, &muxer,  NULL, MuxerReadPacket, NULL);
-  if (!muxer.m_pFormat->pb)
-  {
-    CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::SetupMuxer - Failed to allocate ByteIOContext");
-    Dispose();
-    return false;
-  }
-
-  /* this is streamed, no file, and ignore the index */
-  muxer.m_pFormat->pb->seekable      = 0;
-  muxer.m_pFormat->flags            |= AVFMT_NOFILE | AVFMT_FLAG_IGNIDX;
-  muxer.m_pFormat->bit_rate          = hints.bitrate;
-
-  /* While this is strictly only needed on big-endian systems, we do it on
-   * both to avoid as much dead code as possible.
-   * CoreAudio (at least on the cases we've seen) wants IEC 61937 in
-   * little-endian format even on big-endian systems. */
-#if defined(WORDS_BIGENDIAN) && !defined(TARGET_DARWIN)
-  const char *spdifFlags = "+be";
-#else
-  const char *spdifFlags = "-be";
-#endif
-
-  /* request output of wanted endianness */
-  if (!fOut->priv_class || m_dllAvUtil.av_opt_set(muxer.m_pFormat->priv_data, "spdif_flags", spdifFlags, 0) != 0)
-  {
-#if defined(WORDS_BIGENDIAN) && !defined(TARGET_DARWIN)
-    CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::SetupMuxer - Unable to set big-endian stream mode (FFmpeg too old?), disabling passthrough");
-    Dispose();
-    return false;
-#endif
-  }
-
-  /* add a stream to it */
-  muxer.m_pStream = m_dllAvFormat.avformat_new_stream(muxer.m_pFormat, NULL);
-  if (!muxer.m_pStream)
-  {
-    CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::SetupMuxer - Failed to allocate AVStream context");
-    Dispose();
-    return false;
-  }
-
-
-  /* set the stream's parameters */
-  m_SampleRate = hints.samplerate;
-  if(!m_SampleRate && hints.codec == AV_CODEC_ID_AC3)
-    m_SampleRate = 48000;
-
-  AVCodecContext *codec = muxer.m_pStream->codec;
-  codec->codec_type     = AVMEDIA_TYPE_AUDIO;
-  codec->codec_id       = hints.codec;
-  codec->sample_rate    = m_SampleRate;
-  codec->sample_fmt     = AV_SAMPLE_FMT_S16;
-  codec->channels       = hints.channels;
-  codec->bit_rate       = hints.bitrate;
-  codec->extradata      = new uint8_t[hints.extrasize];
-  codec->extradata_size = hints.extrasize;
-  memcpy(codec->extradata, hints.extradata, hints.extrasize);
-
-  muxer.m_WroteHeader = m_dllAvFormat.avformat_write_header(muxer.m_pFormat, NULL) == 0;
-  if (!muxer.m_WroteHeader)
-  {
-    CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::SetupMuxer - Failed to write the frame header");
-    return false;
-  }
-
-  CLog::Log(LOGINFO, "CDVDAudioCodecPassthroughFFmpeg::SetupMuxer - %s muxer ready", muxerName.c_str());
-  return true;
-}
-
-int CDVDAudioCodecPassthroughFFmpeg::MuxerReadPacket(void *opaque, uint8_t *buf, int buf_size)
-{
-  /* create a new packet and push it into our output buffer */
-  DataPacket *packet = new DataPacket();
-  packet->size       = buf_size;
-  packet->data       = new uint8_t[buf_size];
-  memcpy(packet->data, buf, buf_size);
-
-  Muxer *muxer = (Muxer*)opaque;
-  muxer->m_OutputBuffer.push_back(packet);
-  muxer->m_OutputSize += buf_size;
-
-  /* return how much we wrote to our buffer */
-  return buf_size;
-}
-
-void CDVDAudioCodecPassthroughFFmpeg::WriteFrame(Muxer &muxer, uint8_t *pData, int iSize)
-{
-  AVPacket pkt;
-  m_dllAvCodec.av_init_packet(&pkt);
-  pkt.data = pData;
-  pkt.size = iSize;
-
-  muxer.m_Consumed += iSize;
-  if (m_dllAvFormat.av_write_frame(muxer.m_pFormat, &pkt) < 0)
-    CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::WriteFrame - Failed to write the frame data");
-}
-
-int CDVDAudioCodecPassthroughFFmpeg::GetMuxerData(Muxer &muxer, uint8_t** dst)
-{
-  int size;
-  if(muxer.m_OutputSize)
-  {
-    /* check if the buffer is allocated */
-    if (muxer.m_Buffer)
-    {
-      /* only re-allocate the buffer it is too small */
-      if (muxer.m_BufferSize < muxer.m_OutputSize)
-      {
-        delete[] muxer.m_Buffer;
-        muxer.m_Buffer = new uint8_t[muxer.m_OutputSize];
-        muxer.m_BufferSize = muxer.m_OutputSize;
-      }
-    }
-    else
-    {
-      /* allocate the buffer */
-      muxer.m_Buffer     = new uint8_t[muxer.m_OutputSize];
-      muxer.m_BufferSize = muxer.m_OutputSize;
-    }
-
-    /* fill the buffer with the output data */
-    uint8_t *offset;
-    offset = muxer.m_Buffer;
-    while(!muxer.m_OutputBuffer.empty())
-    {
-      DataPacket* packet = muxer.m_OutputBuffer.front();
-      muxer.m_OutputBuffer.pop_front();
-
-      memcpy(offset, packet->data, packet->size);
-      offset += packet->size;
-
-      delete[] packet->data;
-      delete   packet;
-    }
-
-    *dst = muxer.m_Buffer;
-    size = muxer.m_OutputSize;
-    muxer.m_OutputSize = 0;
-    muxer.m_Consumed = 0;
-    return size;
-  }
-  else
-    return 0;
-}
-
-void CDVDAudioCodecPassthroughFFmpeg::ResetMuxer(Muxer &muxer)
-{
-  muxer.m_OutputSize = 0;
-  muxer.m_Consumed   = 0;
-  while(!muxer.m_OutputBuffer.empty())
-  {
-    DataPacket* packet = muxer.m_OutputBuffer.front();
-    muxer.m_OutputBuffer.pop_front();
-    delete[] packet->data;
-    delete   packet;
-  }
-}
-
-void CDVDAudioCodecPassthroughFFmpeg::DisposeMuxer(Muxer &muxer)
-{
-  ResetMuxer(muxer);
-  delete[] muxer.m_Buffer;
-  muxer.m_Buffer     = NULL;
-  muxer.m_BufferSize = 0;
-  if (muxer.m_pFormat)
-  {
-    if (muxer.m_WroteHeader)
-      m_dllAvFormat.av_write_trailer(muxer.m_pFormat);
-    muxer.m_WroteHeader = false;
-    if (muxer.m_pStream)
-      delete[] muxer.m_pStream->codec->extradata;
-    m_dllAvUtil.av_freep(&muxer.m_pFormat->pb);
-    m_dllAvUtil.av_freep(&muxer.m_pFormat);
-    m_dllAvUtil.av_freep(&muxer.m_pStream);
-  }
-}
-/*===================== END MUXER FUNCTIONS ========================*/
-
-bool CDVDAudioCodecPassthroughFFmpeg::SupportsFormat(CDVDStreamInfo &hints)
-{
-  m_pSyncFrame = NULL;
-
-       if (m_bSupportsAC3Out && hints.codec == AV_CODEC_ID_AC3) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncAC3;
-  else if (m_bSupportsDTSOut && hints.codec == AV_CODEC_ID_DTS) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncDTS;
-  else if (m_bSupportsAACOut && hints.codec == AV_CODEC_ID_AAC) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncAAC;
-  else return false;
-
-  return true;
-}
-
-bool CDVDAudioCodecPassthroughFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options)
-{
-  // TODO - move this stuff somewhere else
-  bool m_bSupportsAC3Out    = CAEFactory::SupportsRaw(AE_FMT_AC3);
-  bool m_bSupportsEAC3Out   = CAEFactory::SupportsRaw(AE_FMT_EAC3);
-  bool m_bSupportsDTSOut    = CAEFactory::SupportsRaw(AE_FMT_DTS);
-
-  if ((hints.codec == AV_CODEC_ID_AC3 && !m_bSupportsAC3Out) ||
-      (hints.codec == AV_CODEC_ID_EAC3 && !m_bSupportsEAC3Out) ||
-      (hints.codec == AV_CODEC_ID_DTS && !m_bSupportsDTSOut))
-  {
-    return false;
-  }
-
-  // TODO - this is only valid for video files, and should be moved somewhere else
-  if( hints.channels == 2 && CMediaSettings::Get().GetCurrentVideoSettings().m_OutputToAllSpeakers )
-  {
-    CLog::Log(LOGINFO, "CDVDAudioCodecPassthroughFFmpeg::Open - disabled passthrough due to video OTAS");
-    return false;
-  }
-
-  // TODO - some soundcards do support other sample rates, but they are quite uncommon
-  if( hints.samplerate > 0 && hints.samplerate != 48000 )
-  {
-    CLog::Log(LOGINFO, "CDVDAudioCodecPassthroughFFmpeg::Open - disabled passthrough due to sample rate not being 48000");
-    return false;
-  }
-
-  if (!m_dllAvUtil.Load() || !m_dllAvCodec.Load() || !m_dllAvFormat.Load())
-    return false;
-
-  m_dllAvFormat.av_register_all();
-
-  /* see if the muxer supports our codec (see spdif.c for supported formats) */
-  if (!SupportsFormat(hints))
-  {
-    CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::Open - FFmpeg SPDIF muxer does not support this codec");
-    Dispose();
-    return false;
-  }
-  else
-  {
-    /* aac needs to be wrapped into ADTS frames */
-    if (hints.codec == AV_CODEC_ID_AAC)
-      if (!SetupMuxer(hints, "adts", m_ADTS))
-      {
-        CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::Open - Unable to setup ADTS muxer");
-        Dispose();
-        return false;
-      }
-
-    m_Codec   = NULL;
-  }
-
-  if (!SetupMuxer(hints, "spdif", m_SPDIF))
-    return false;
-
-  Reset();
-
-  /* we will check the first packet's crc */
-  m_LostSync = true;
-
-  m_codec = hints.codec;
-
-  return true;
-}
-
-void CDVDAudioCodecPassthroughFFmpeg::Dispose()
-{
-  Reset();
-
-  DisposeMuxer(m_SPDIF);
-  DisposeMuxer(m_ADTS );
-
-  if (m_DecodeBuffer)
-  {
-    _aligned_free(m_DecodeBuffer);
-    m_DecodeBuffer = NULL;
-  }
-
-  delete m_Codec;
-  m_Codec   = NULL;
-}
-
-int CDVDAudioCodecPassthroughFFmpeg::Decode(uint8_t* pData, int iSize)
-{
-  unsigned int used, fSize;
-  fSize = iSize;
-
-  /* if we are muxing into ADTS (AAC) */
-  int adts_used = 0;
-  if (m_ADTS.m_pFormat)
-  {
-    adts_used = iSize;
-    WriteFrame(m_ADTS, pData, iSize);
-    iSize = GetMuxerData(m_ADTS, &pData);
-  }
-
-  used = 0;
-  while(iSize > 0)
-  {
-    /* skip data until we can sync and know how much we need */
-    if (m_Needed == 0)
-    {
-      /* if we have a sync function for this codec */
-      if (m_pSyncFrame)
-      {
-	int skip = (this->*m_pSyncFrame)(pData, iSize, &m_Needed);
-	if (skip > 0)
-	{
-	  /* we lost sync, so invalidate our buffer */
-	  m_NeededUsed = 0;
-	  return used + skip;
-	}
-      }
-      else
-        m_Needed = iSize;
-    }
-
-    if(m_SPDIF.m_pStream->codec->sample_rate != m_SampleRate)
-    {
-     CLog::Log(LOGDEBUG, "CDVDAudioCodecPassthroughFFmpeg::Decode - stream changed sample rate from %d to %d"
-                       , m_SPDIF.m_pStream->codec->sample_rate
-                       , m_SampleRate);
-     m_SPDIF.m_pStream->codec->sample_rate = m_SampleRate;
-    }
-
-    /* check for bad parsing */
-    assert(m_Needed > 0);
-
-    /* append one block or less of data */
-    int copy;
-    int room = sizeof(m_NeededBuffer) - m_NeededUsed;
-    int need = m_Needed - m_NeededUsed;
-    copy = room  > need ? need : room;
-    copy = iSize > copy ? copy : iSize;
-    memcpy(m_NeededBuffer + m_NeededUsed, pData, copy);
-
-    m_NeededUsed += copy;
-    used         += copy;
-    iSize        -= copy;
-    pData        += copy;
-
-    /* if we have enough data in the buffer, write it out */
-    if (m_NeededUsed == m_Needed)
-    {
-      WriteFrame(m_SPDIF, m_NeededBuffer, m_Needed);
-      m_NeededUsed = 0;
-      m_Needed     = 0;
-    }
-  }
-
-  /* return how much data we copied */
-  if (m_ADTS.m_pFormat)
-    return adts_used;
-  else
-    return used;
-}
-
-int CDVDAudioCodecPassthroughFFmpeg::GetData(uint8_t** dst)
-{
-  return GetMuxerData(m_SPDIF, dst);
-}
-
-void CDVDAudioCodecPassthroughFFmpeg::Reset()
-{
-  m_DecodeSize = 0;
-  m_LostSync   = true;
-  m_Needed     = 0;
-  m_NeededUsed = 0;
-
-  ResetMuxer(m_SPDIF);
-  ResetMuxer(m_ADTS );
-}
-
-int CDVDAudioCodecPassthroughFFmpeg::GetChannels()
-{
-  //Can't return correct channels here as this is used to keep sync.
-  //should probably have some other way to find out this
-  return 2;
-}
-
-int CDVDAudioCodecPassthroughFFmpeg::GetSampleRate()
-{
-  return m_SPDIF.m_pStream->codec->sample_rate;
-}
-
-int CDVDAudioCodecPassthroughFFmpeg::GetEncodedSampleRate()
-{
-  return m_SPDIF.m_pStream->codec->sample_rate;
-}
-
-enum AEDataFormat CDVDAudioCodecPassthroughFFmpeg::GetDataFormat()
-{
-  switch(m_codec)
-  {
-    case AV_CODEC_ID_AC3:      return AE_FMT_AC3;
-    case AV_CODEC_ID_DTS:      return AE_FMT_DTS;
-    default:
-      return AE_FMT_INVALID; //Unknown stream type
-  }
-}
-
-
-int CDVDAudioCodecPassthroughFFmpeg::GetBitsPerSample()
-{
-  return OUT_SAMPLESIZE;
-}
-
-int CDVDAudioCodecPassthroughFFmpeg::GetBufferSize()
-{
-  if (m_Codec)
-    return m_Codec->GetBufferSize();
-  else
-    return m_SPDIF.m_Consumed + m_ADTS.m_Consumed + m_NeededUsed;
-}
-
-/* ========================== SYNC FUNCTIONS ========================== */
-unsigned int CDVDAudioCodecPassthroughFFmpeg::SyncAC3(uint8_t* pData, unsigned int iSize, unsigned int *fSize)
-{
-  unsigned int skip = 0;
-  for(skip = 0; iSize - skip > 6; ++skip, ++pData)
-  {
-    /* search for an ac3 sync word */
-    if(pData[0] != 0x0b || pData[1] != 0x77)
-      continue;
- 
-    uint8_t fscod      = pData[4] >> 6;
-    uint8_t frmsizecod = pData[4] & 0x3F;
-    uint8_t bsid       = pData[5] >> 3;
-
-    /* sanity checks on the header */
-    if (
-        fscod      ==   3 ||
-        frmsizecod >   37 ||
-        bsid       > 0x11
-    ) continue;
-
-    /* get the details we need to check crc1 and framesize */
-    uint16_t     bitrate   = AC3Bitrates[frmsizecod >> 1];
-    unsigned int framesize = 0;
-    switch(fscod)
-    {
-      case 0: framesize = bitrate * 2; break;
-      case 1: framesize = (320 * bitrate / 147 + (frmsizecod & 1 ? 1 : 0)); break;
-      case 2: framesize = bitrate * 4; break;
-    }
-
-    *fSize = framesize * 2;
-    m_SampleRate = AC3FSCod[fscod];
-
-    /* dont do extensive testing if we have not lost sync */
-    if (!m_LostSync && skip == 0)
-      return 0;
-
-    unsigned int crc_size;
-    /* if we have enough data, validate the entire packet, else try to validate crc2 (5/8 of the packet) */
-    if (framesize <= iSize - skip)
-         crc_size = framesize - 1;
-    else crc_size = (framesize >> 1) + (framesize >> 3) - 1;
-
-    if (crc_size <= iSize - skip)
-      if(m_dllAvUtil.av_crc(m_dllAvUtil.av_crc_get_table(AV_CRC_16_ANSI), 0, &pData[2], crc_size * 2))
-        continue;
-
-    /* if we get here, we can sync */
-    m_LostSync = false;
-    return skip;
-  }
-
-  /* if we get here, the entire packet is invalid and we have lost sync */
-  m_LostSync = true;
-  return iSize;
-}
-
-unsigned int CDVDAudioCodecPassthroughFFmpeg::SyncDTS(uint8_t* pData, unsigned int iSize, unsigned int *fSize)
-{
-  unsigned int skip;
-  unsigned int srCode;
-  bool littleEndian;
-
-  for(skip = 0; iSize - skip > 8; ++skip, ++pData)
-  {
-    /* 16bit le */ if (pData[0] == 0x7F && pData[1] == 0xFE && pData[2] == 0x80 && pData[3] == 0x01                                                 ) littleEndian = true ; else
-    /* 14bit le */ if (pData[0] == 0x1F && pData[1] == 0xFF && pData[2] == 0xE8 && pData[3] == 0x00 && pData[4] == 0x07 && (pData[5] & 0xF0) == 0xF0) littleEndian = true ; else
-    /* 16bit be */ if (pData[1] == 0x7F && pData[0] == 0xFE && pData[3] == 0x80 && pData[2] == 0x01                                                 ) littleEndian = false; else
-    /* 14bit be */ if (pData[1] == 0x1F && pData[0] == 0xFF && pData[3] == 0xE8 && pData[2] == 0x00 && pData[5] == 0x07 && (pData[4] & 0xF0) == 0xF0) littleEndian = false; else
-      continue;
-
-    if (littleEndian)
-    {
-      /* if it is not a termination frame, check the next 6 bits are set */
-      if ((pData[4] & 0x80) == 0x80 && (pData[4] & 0x7C) != 0x7C)
-        continue;
-
-      /* get the frame size */
-      *fSize = ((((pData[5] & 0x3) << 8 | pData[6]) << 4) | ((pData[7] & 0xF0) >> 4)) + 1;
-      srCode = (pData[8] & 0x3C) >> 2;
-   }
-   else
-   {
-      /* if it is not a termination frame, check the next 6 bits are set */
-      if ((pData[5] & 0x80) == 0x80 && (pData[5] & 0x7C) != 0x7C)
-        continue;
-
-      /* get the frame size */
-      *fSize = ((((pData[4] & 0x3) << 8 | pData[7]) << 4) | ((pData[6] & 0xF0) >> 4)) + 1;
-      srCode = (pData[9] & 0x3C) >> 2;
-   }
-
-    /* make sure the framesize is sane */
-    if (*fSize < 96 || *fSize > 16384)
-      continue;
-
-    m_SampleRate = DTSFSCod[srCode];
-    m_LostSync = false;
-    return skip;
-  }
-
-  m_LostSync = true;
-  return iSize;
-}
-
-unsigned int CDVDAudioCodecPassthroughFFmpeg::SyncAAC(uint8_t* pData, unsigned int iSize, unsigned int *fSize)
-{
-  unsigned int skip;
-  for(skip = 0; iSize - skip > 5; ++skip, ++pData)
-  {
-    if (pData[0] != 0xFF || (pData[1] & 0xF0) != 0xF0)
-      continue;
-
-    *fSize = (pData[3] & 0x03) << 11 | pData[4] << 3 | (pData[5] & 0xE0) >> 5;
-    if (*fSize < 7)
-      continue;
-
-    m_LostSync = false;
-    return skip;
-  }
-
-  m_LostSync = true;
-  return iSize;
-}
-/* ========================== END SYNC FUNCTIONS ========================== */
-
-
-CAEChannelInfo CDVDAudioCodecPassthroughFFmpeg::GetChannelMap()
-{
-  static enum AEChannel map[2][9] = {
-    {AE_CH_RAW, AE_CH_RAW, AE_CH_NULL},
-    {AE_CH_RAW, AE_CH_RAW, AE_CH_RAW, AE_CH_RAW, AE_CH_RAW, AE_CH_RAW, AE_CH_RAW, AE_CH_RAW, AE_CH_NULL}
-  };
-
-  return map[0];
-}
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h
deleted file mode 100644
index 16facb4e39..0000000000
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <list>
-#include "system.h"
-#include "DllAvFormat.h"
-#include "DllAvCodec.h"
-#include "DllAvUtil.h"
-
-#include "DVDAudioCodec.h"
-
-class CDVDAudioCodecPassthroughFFmpeg : public CDVDAudioCodec
-{
-public:
-  CDVDAudioCodecPassthroughFFmpeg();
-  virtual ~CDVDAudioCodecPassthroughFFmpeg();
-
-  virtual bool Open(CDVDStreamInfo &hints, CDVDCodecOptions &options);
-  virtual void Dispose();
-  virtual int Decode(uint8_t* pData, int iSize);
-  virtual int GetData(uint8_t** dst);
-  virtual void Reset();
-  virtual int GetChannels();
-  virtual CAEChannelInfo GetChannelMap();
-  virtual int  GetSampleRate();
-  virtual int  GetEncodedSampleRate();
-  virtual enum AEDataFormat GetDataFormat();
-  virtual int GetBitsPerSample();
-  virtual bool NeedPassthrough() { return true; }
-  virtual const char* GetName()  { return "PassthroughFFmpeg"; }
-  virtual int GetBufferSize();
-private:
-  DllAvFormat m_dllAvFormat;
-  DllAvUtil   m_dllAvUtil;
-  DllAvCodec  m_dllAvCodec;
-
-  typedef struct
-  {
-    int      size;
-    uint8_t *data;
-  } DataPacket;
-
-  typedef struct
-  {
-    AVFormatContext       *m_pFormat;
-    AVStream              *m_pStream;
-    std::list<DataPacket*> m_OutputBuffer;
-    unsigned int           m_OutputSize;
-    bool                   m_WroteHeader;
-    unsigned char          m_BCBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE];
-    unsigned int           m_Consumed;
-    unsigned int           m_BufferSize;
-    uint8_t               *m_Buffer;
-  } Muxer;
-
-  Muxer      m_SPDIF, m_ADTS;
-  bool       SetupMuxer(CDVDStreamInfo &hints, CStdString muxerName, Muxer &muxer);
-  static int MuxerReadPacket(void *opaque, uint8_t *buf, int buf_size);
-  void       WriteFrame(Muxer &muxer, uint8_t *pData, int iSize);
-  int        GetMuxerData(Muxer &muxer, uint8_t** dst);
-  void       ResetMuxer(Muxer &muxer);
-  void       DisposeMuxer(Muxer &muxer);
-
-  bool m_bSupportsAC3Out;
-  bool m_bSupportsDTSOut;
-  bool m_bSupportsAACOut;
-
-  CDVDAudioCodec   *m_Codec;
-  uint8_t          *m_DecodeBuffer;
-  unsigned int      m_DecodeSize;
-  bool SupportsFormat(CDVDStreamInfo &hints);
-
-  uint8_t      m_NeededBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE];
-  unsigned int m_NeededUsed;
-  unsigned int m_Needed;
-  bool         m_LostSync;
-  int          m_SampleRate;
-  AVCodecID    m_codec;
-
-  unsigned int (CDVDAudioCodecPassthroughFFmpeg::*m_pSyncFrame)(uint8_t* pData, unsigned int iSize, unsigned int *fSize);
-  unsigned int SyncAC3(uint8_t* pData, unsigned int iSize, unsigned int *fSize);
-  unsigned int SyncDTS(uint8_t* pData, unsigned int iSize, unsigned int *fSize);
-  unsigned int SyncAAC(uint8_t* pData, unsigned int iSize, unsigned int *fSize);
-};
-
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
index f7ca0725a9..1446b96919 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in
@@ -8,10 +8,6 @@ SRCS += DVDAudioCodecLPcm.cpp
 SRCS += DVDAudioCodecPassthrough.cpp
 SRCS += DVDAudioCodecPcm.cpp
 
-ifeq ($(findstring osx,@ARCH@),osx)
-SRCS += DVDAudioCodecPassthroughFFmpeg.cpp
-endif
-
 LIB=Audio.a
 
 include @abs_top_srcdir@/Makefile.include
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
index 3e105d310d..a7445d313a 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -51,9 +51,6 @@
 #include "Audio/DVDAudioCodecLibMad.h"
 #include "Audio/DVDAudioCodecPcm.h"
 #include "Audio/DVDAudioCodecLPcm.h"
-#if defined(TARGET_DARWIN_OSX) || defined(TARGET_DARWIN_IOS)
-#include "Audio/DVDAudioCodecPassthroughFFmpeg.h"
-#endif
 #include "Audio/DVDAudioCodecPassthrough.h"
 #include "Overlay/DVDOverlayCodecSSA.h"
 #include "Overlay/DVDOverlayCodecText.h"
@@ -332,18 +329,6 @@ CDVDAudioCodec* CDVDFactoryCodec::CreateAudioCodec( CDVDStreamInfo &hint)
   CDVDCodecOptions options;
 
   // try passthrough first
-#if defined(TARGET_DARWIN_OSX) || defined(TARGET_DARWIN_IOS)
-  switch(hint.codec)
-  {
-    case AV_CODEC_ID_AC3:
-    case AV_CODEC_ID_DTS:
-      pCodec = OpenCodec( new CDVDAudioCodecPassthroughFFmpeg(), hint, options );
-      if( pCodec ) return pCodec;
-      break;
-    default:
-      break;
-  }
-#endif
   pCodec = OpenCodec( new CDVDAudioCodecPassthrough(), hint, options );
   if( pCodec ) return pCodec;