Remove win32/qt/xanim/real binary codecs loading

Remove the win32 loader - the win32 emulation layer, as well as the
code for using DirectShow/DMO/VFW codecs. Remove loading of xanim,
QuickTime, and RealMedia codecs.

The win32 emulation layer is based on a very old version of wine.
Apparently, wine code was copied and hacked until it was somehow able
to load a limited collection of binary codecs. It poked around in the
code segment of some known binary codecs to disable unsupported win32
API calls to make them work. Example from module.c:

    for (i=0;i<5;i++)  RVA(0x19e842)[i]=0x90; // make_new_region ?
    for (i=0;i<28;i++) RVA(0x19e86d)[i]=0x90; // call__call_CreateCompatibleDC ?
    for (i=0;i<5;i++)  RVA(0x19e898)[i]=0x90; // jmp_to_call_loadbitmap ?
    for (i=0;i<9;i++)  RVA(0x19e8ac)[i]=0x90; // call__calls_OLE_shit ?
    for (i=0;i<106;i++) RVA(0x261b10)[i]=0x90; // disable threads

Just to show how utterly insane this code is. You wouldn't want even
your worst enemy to have to maintain this. In fact, it seems nobody
made major changes to this code ever since it was committed.

Most formats can be decoded by libavcodecs these days, and the loader
couldn't be used on 64 bit platforms anyway. The same is (probably)
true for the other binary codecs.

General note about how support for win32 codecs could be added back:

It's not possible to replace the win32 loader code by using wine as
library, because modern wine can not be linked with native Linux
programs for certain reasons. It would be possible to to move DirectShow
video decoding into a separate process linked with wine, like the
CoreAVC-for-Linux patches do. There is also the mplayer-ww fork, which
uses the dshownative library to use DirectShow codecs on Windows.

14 files changed, 0 insertions, 3608 deletions

diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index 2e67bd23af..d1e3c91430 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -40,15 +40,9 @@ extern const ad_functions_t mpcodecs_ad_pcm;
 extern const ad_functions_t mpcodecs_ad_dvdpcm;
 extern const ad_functions_t mpcodecs_ad_alaw;
 extern const ad_functions_t mpcodecs_ad_imaadpcm;
-extern const ad_functions_t mpcodecs_ad_msadpcm;
-extern const ad_functions_t mpcodecs_ad_dshow;
-extern const ad_functions_t mpcodecs_ad_dmo;
-extern const ad_functions_t mpcodecs_ad_acm;
 extern const ad_functions_t mpcodecs_ad_faad;
 extern const ad_functions_t mpcodecs_ad_libmad;
-extern const ad_functions_t mpcodecs_ad_realaud;
 extern const ad_functions_t mpcodecs_ad_libdv;
-extern const ad_functions_t mpcodecs_ad_qtaudio;
 extern const ad_functions_t mpcodecs_ad_spdif;
 extern const ad_functions_t mpcodecs_ad_libdca;
 
@@ -68,25 +62,12 @@ const ad_functions_t * const mpcodecs_ad_drivers[] =
   &mpcodecs_ad_dvdpcm,
   &mpcodecs_ad_alaw,
   &mpcodecs_ad_imaadpcm,
-  &mpcodecs_ad_msadpcm,
-#ifdef CONFIG_WIN32DLL
-  &mpcodecs_ad_dshow,
-  &mpcodecs_ad_dmo,
-  &mpcodecs_ad_acm,
-  &mpcodecs_ad_twin,
-#endif
-#ifdef CONFIG_QTX_CODECS
-  &mpcodecs_ad_qtaudio,
-#endif
 #ifdef CONFIG_FAAD
   &mpcodecs_ad_faad,
 #endif
 #ifdef CONFIG_LIBMAD
   &mpcodecs_ad_libmad,
 #endif
-#ifdef CONFIG_REALCODECS
-  &mpcodecs_ad_realaud,
-#endif
 #ifdef CONFIG_LIBDV095
   &mpcodecs_ad_libdv,
 #endif
diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c
deleted file mode 100644
index 1b1184a06a..0000000000
--- a/libmpcodecs/ad_acm.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "mp_msg.h"
-#include "libmpdemux/aviprint.h"
-#include "loader/wineacm.h"
-
-#include "ad_internal.h"
-#include "osdep/timer.h"
-
-static const ad_info_t info =
-{
-	"Win32/ACM decoders",
-	"acm",
-	"A'rpi",
-	"A'rpi & Alex",
-	""
-};
-
-LIBAD_EXTERN(acm)
-
-typedef struct {
-    WAVEFORMATEX *o_wf;
-    HACMSTREAM handle;
-} acm_context_t;
-
-static int init(sh_audio_t *sh_audio)
-{
-    int ret=decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size);
-    if(ret<0){
-        mp_msg(MSGT_DECAUDIO,MSGL_INFO,"ACM decoding error: %d\n",ret);
-        return 0;
-    }
-    sh_audio->a_buffer_len=ret;
-  return 1;
-}
-
-static int preinit(sh_audio_t *sh_audio)
-{
-    HRESULT ret;
-    WAVEFORMATEX *in_fmt = sh_audio->wf;
-    DWORD srcsize = 0;
-    acm_context_t *priv;
-
-    priv = malloc(sizeof(acm_context_t));
-    if (!priv)
-	return 0;
-    sh_audio->context = priv;
-
-    mp_msg(MSGT_WIN32, MSGL_V, "======= Win32 (ACM) AUDIO Codec init =======\n");
-
-//    priv->handle = NULL;
-
-    priv->o_wf = malloc(sizeof(*priv->o_wf));
-    if (!priv->o_wf)
-    {
-	mp_tmsg(MSGT_DECAUDIO,MSGL_ERR,"Could not load/initialize Win32/ACM audio codec (missing DLL file?).\n");
-	return 0;
-    }
-
-    priv->o_wf->nChannels = in_fmt->nChannels;
-    priv->o_wf->nSamplesPerSec = in_fmt->nSamplesPerSec;
-    priv->o_wf->nAvgBytesPerSec = 2*in_fmt->nSamplesPerSec*in_fmt->nChannels;
-    priv->o_wf->wFormatTag = WAVE_FORMAT_PCM;
-    priv->o_wf->nBlockAlign = 2*in_fmt->nChannels;
-    priv->o_wf->wBitsPerSample = 16;
-//    priv->o_wf->wBitsPerSample = inf_fmt->wBitsPerSample;
-    priv->o_wf->cbSize = 0;
-
-    if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
-    {
-	mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
-	print_wave_header(in_fmt, MSGL_V);
-	mp_msg(MSGT_DECAUDIO, MSGL_V, "Output format:\n");
-	print_wave_header(priv->o_wf, MSGL_V);
-    }
-
-    MSACM_RegisterDriver((const char *)sh_audio->codec->dll, in_fmt->wFormatTag, 0);
-    ret = acmStreamOpen(&priv->handle, (HACMDRIVER)NULL, in_fmt,
-			priv->o_wf, NULL, 0, 0, 0);
-    if (ret)
-    {
-	if (ret == ACMERR_NOTPOSSIBLE)
-	    mp_msg(MSGT_WIN32, MSGL_ERR, "ACM_Decoder: Unappropriate audio format\n");
-	else
-	    mp_msg(MSGT_WIN32, MSGL_ERR, "ACM_Decoder: acmStreamOpen error: %d\n",
-		(int)ret);
-	mp_tmsg(MSGT_DECAUDIO,MSGL_ERR,"Could not load/initialize Win32/ACM audio codec (missing DLL file?).\n");
-	return 0;
-    }
-    mp_msg(MSGT_WIN32, MSGL_V, "Audio codec opened OK! ;-)\n");
-
-    acmStreamSize(priv->handle, in_fmt->nBlockAlign, &srcsize, ACM_STREAMSIZEF_SOURCE);
-    //if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize);
-    srcsize *= 2;
-    //if (srcsize < MAX_OUTBURST) srcsize = MAX_OUTBURST;
-    if (!srcsize)
-    {
-	mp_msg(MSGT_WIN32, MSGL_WARN, "Warning! ACM codec reports srcsize=0\n");
-	srcsize = 16384;
-    }
-    // limit srcsize to 4-16kb
-    //while(srcsize && srcsize<4096) srcsize*=2;
-    //while(srcsize>16384) srcsize/=2;
-    sh_audio->audio_out_minsize=srcsize; // audio output min. size
-    mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM output buffer min. size: %ld\n",srcsize);
-
-    acmStreamSize(priv->handle, srcsize, &srcsize, ACM_STREAMSIZEF_DESTINATION);
-//    if(srcsize<in_fmt->nBlockAlign) srcsize=in_fmt->nBlockAlign;
-
-    if (!srcsize)
-    {
-	mp_msg(MSGT_WIN32, MSGL_WARN, "Warning! ACM codec reports srcsize=0\n");
-	srcsize = 2*in_fmt->nBlockAlign;
-    }
-
-    mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM input buffer min. size: %ld\n",srcsize);
-
-    sh_audio->audio_in_minsize=2*srcsize; // audio input min. size
-
-    sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
-    sh_audio->channels=priv->o_wf->nChannels;
-    sh_audio->samplerate=priv->o_wf->nSamplesPerSec;
-    sh_audio->samplesize=2;
-
-    mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/ACM audio codec init OK!\n");
-    return 1;
-}
-
-static void uninit(sh_audio_t *sh)
-{
-    HRESULT ret;
-    acm_context_t *priv = sh->context;
-
-retry:
-    ret = acmStreamClose(priv->handle, 0);
-
-    if (ret)
-    switch(ret)
-    {
-	case ACMERR_BUSY:
-	case ACMERR_CANCELED:
-	    mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: stream busy, waiting..\n");
-	    usec_sleep(100000000);
-	    goto retry;
-	case ACMERR_UNPREPARED:
-	case ACMERR_NOTPOSSIBLE:
-	    return;
-	default:
-	    mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %ld\n", ret);
-	    return;
-    }
-
-    MSACM_UnregisterAllDrivers();
-
-    free(priv->o_wf);
-    free(priv);
-}
-
-static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
-{
-  int skip;
-    switch(cmd)
-    {
-      case ADCTRL_SKIP_FRAME:
-		    skip=sh_audio->wf->nBlockAlign;
-		    if(skip<16){
-		      skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7);
-		      if(skip<16) skip=16;
-		    }
-		    demux_read_data(sh_audio->ds,NULL,skip);
-	  return CONTROL_TRUE;
-    }
-  return CONTROL_UNKNOWN;
-}
-
-static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
-{
-    ACMSTREAMHEADER ash;
-    HRESULT hr;
-    DWORD srcsize=0;
-    DWORD len=minlen;
-    acm_context_t *priv = sh_audio->context;
-
-    acmStreamSize(priv->handle, len, &srcsize, ACM_STREAMSIZEF_DESTINATION);
-    mp_msg(MSGT_WIN32,MSGL_DBG3,"acm says: srcsize=%ld  (buffsize=%d)  out_size=%ld\n",srcsize,sh_audio->a_in_buffer_size,len);
-
-    if(srcsize<sh_audio->wf->nBlockAlign){
-       srcsize=sh_audio->wf->nBlockAlign;
-       acmStreamSize(priv->handle, srcsize, &len, ACM_STREAMSIZEF_SOURCE);
-       if(len>maxlen) len=maxlen;
-    }
-
-//    if(srcsize==0) srcsize=((WAVEFORMATEX *)&sh_audio->o_wf_ext)->nBlockAlign;
-    if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!!
-    if(sh_audio->a_in_buffer_len<srcsize){
-      sh_audio->a_in_buffer_len+=
-        demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
-        srcsize-sh_audio->a_in_buffer_len);
-    }
-    mp_msg(MSGT_WIN32,MSGL_DBG3,"acm convert %d -> %ld bytes\n",sh_audio->a_in_buffer_len,len);
-    memset(&ash, 0, sizeof(ash));
-    ash.cbStruct=sizeof(ash);
-    ash.fdwStatus=0;
-    ash.dwUser=0;
-    ash.pbSrc=sh_audio->a_in_buffer;
-    ash.cbSrcLength=sh_audio->a_in_buffer_len;
-    ash.pbDst=buf;
-    ash.cbDstLength=len;
-    hr=acmStreamPrepareHeader(priv->handle,&ash,0);
-    if(hr){
-      mp_msg(MSGT_WIN32,MSGL_V,"ACM_Decoder: acmStreamPrepareHeader error %d\n",(int)hr);
-      return -1;
-    }
-    hr=acmStreamConvert(priv->handle,&ash,0);
-    if(hr){
-      mp_msg(MSGT_WIN32,MSGL_DBG2,"ACM_Decoder: acmStreamConvert error %d\n",(int)hr);
-      switch(hr)
-      {
-	case ACMERR_NOTPOSSIBLE:
-	case ACMERR_UNPREPARED:
-	    mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: acmStreamConvert error: probarly not initialized!\n");
-      }
-//      return -1;
-    }
-    mp_msg(MSGT_WIN32,MSGL_DBG2,"acm converted %ld -> %ld\n",ash.cbSrcLengthUsed,ash.cbDstLengthUsed);
-    if(ash.cbSrcLengthUsed>=sh_audio->a_in_buffer_len){
-      sh_audio->a_in_buffer_len=0;
-    } else {
-      sh_audio->a_in_buffer_len-=ash.cbSrcLengthUsed;
-      memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[ash.cbSrcLengthUsed],sh_audio->a_in_buffer_len);
-    }
-    len=ash.cbDstLengthUsed;
-    hr=acmStreamUnprepareHeader(priv->handle,&ash,0);
-    if(hr){
-      mp_msg(MSGT_WIN32,MSGL_V,"ACM_Decoder: acmStreamUnprepareHeader error %d\n",(int)hr);
-    }
-    return len;
-}
diff --git a/libmpcodecs/ad_dmo.c b/libmpcodecs/ad_dmo.c
deleted file mode 100644
index 714651a7e4..0000000000
--- a/libmpcodecs/ad_dmo.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "options.h"
-#include "mp_msg.h"
-
-#include "ad_internal.h"
-#include "libaf/reorder_ch.h"
-
-static const ad_info_t info =
-{
-	"Win32/DMO decoders",
-	"dmo",
-	"A'rpi",
-	"avifile.sf.net",
-	""
-};
-
-LIBAD_EXTERN(dmo)
-
-#include "loader/dmo/DMO_AudioDecoder.h"
-
-static int init(sh_audio_t *sh)
-{
-  return 1;
-}
-
-static int preinit(sh_audio_t *sh_audio)
-{
-  struct MPOpts *opts = sh_audio->opts;
-  DMO_AudioDecoder* ds_adec;
-  int chans=(opts->audio_output_channels==sh_audio->wf->nChannels) ?
-      opts->audio_output_channels : (sh_audio->wf->nChannels>=2 ? 2 : 1);
-  if(!(ds_adec=DMO_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,sh_audio->wf,chans)))
-  {
-    mp_tmsg(MSGT_DECAUDIO,MSGL_ERR,"ERROR: Could not open required DirectShow codec %s.\n",sh_audio->codec->dll);
-    return 0;
-  }
-    sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
-    sh_audio->channels=chans;
-    sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
-    sh_audio->samplesize=2;
-    sh_audio->audio_in_minsize=4*sh_audio->wf->nBlockAlign;
-    if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192;
-    sh_audio->audio_out_minsize=4*16384;
-    sh_audio->context = ds_adec;
-  mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DMO audio codec init OK!\n");
-  return 1;
-}
-
-static void uninit(sh_audio_t *sh)
-{
-    DMO_AudioDecoder* ds_adec = sh->context;
-    DMO_AudioDecoder_Destroy(ds_adec);
-}
-
-static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
-{
-  int skip;
-    switch(cmd)
-    {
-      case ADCTRL_SKIP_FRAME:
-		    skip=sh_audio->wf->nBlockAlign;
-		    if(skip<16){
-		      skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7);
-		      if(skip<16) skip=16;
-		    }
-		    demux_read_data(sh_audio->ds,NULL,skip);
-	  return CONTROL_TRUE;
-    }
-  return CONTROL_UNKNOWN;
-}
-
-static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
-{
-	DMO_AudioDecoder* ds_adec = sh_audio->context;
-//	int len=-1;
-        int size_in=0;
-        int size_out=0;
-        int srcsize=DMO_AudioDecoder_GetSrcSize(ds_adec, maxlen);
-        mp_msg(MSGT_DECAUDIO,MSGL_DBG3,"DMO says: srcsize=%d  (buffsize=%d)  out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,maxlen);
-        if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!!
-        if(sh_audio->a_in_buffer_len<srcsize){
-          sh_audio->a_in_buffer_len+=
-            demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
-            srcsize-sh_audio->a_in_buffer_len);
-        }
-        DMO_AudioDecoder_Convert(ds_adec, sh_audio->a_in_buffer,sh_audio->a_in_buffer_len,
-            buf,maxlen, &size_in,&size_out);
-        mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"DMO: audio %d -> %d converted  (in_buf_len=%d of %d)  %d\n",size_in,size_out,sh_audio->a_in_buffer_len,sh_audio->a_in_buffer_size,ds_tell_pts(sh_audio->ds));
-        if(size_in>=sh_audio->a_in_buffer_len){
-          sh_audio->a_in_buffer_len=0;
-        } else {
-          sh_audio->a_in_buffer_len-=size_in;
-          memmove(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len);
-        }
-        if (size_out > 0 && sh_audio->channels >= 5) {
-          reorder_channel_nch(buf, AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT,
-                              AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT,
-                              sh_audio->channels,
-                              size_out / sh_audio->samplesize,
-                              sh_audio->samplesize);
-        }
-//        len=size_out;
-  return size_out;
-}
diff --git a/libmpcodecs/ad_dshow.c b/libmpcodecs/ad_dshow.c
deleted file mode 100644
index 8fb94660a4..0000000000
--- a/libmpcodecs/ad_dshow.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "mp_msg.h"
-
-#include "ad_internal.h"
-
-static const ad_info_t info =
-{
-	"Win32/DirectShow decoders",
-	"dshow",
-	"Nick Kurshev",
-	"avifile.sf.net",
-	""
-};
-
-LIBAD_EXTERN(dshow)
-
-#include "loader/dshow/DS_AudioDecoder.h"
-
-static int init(sh_audio_t *sh)
-{
-  return 1;
-}
-
-static int preinit(sh_audio_t *sh_audio)
-{
-  DS_AudioDecoder* ds_adec;
-  if(!(ds_adec=DS_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,sh_audio->wf)))
-  {
-    mp_tmsg(MSGT_DECAUDIO,MSGL_ERR,"ERROR: Could not open required DirectShow codec %s.\n",sh_audio->codec->dll);
-    return 0;
-  }
-    sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
-    sh_audio->channels=sh_audio->wf->nChannels;
-    sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
-    sh_audio->samplesize=2;
-    sh_audio->audio_in_minsize=2*sh_audio->wf->nBlockAlign;
-    if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192;
-    sh_audio->audio_out_minsize=16384;
-    sh_audio->context = ds_adec;
-  mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DShow audio codec init OK!\n");
-  return 1;
-}
-
-static void uninit(sh_audio_t *sh)
-{
-    DS_AudioDecoder* ds_adec = sh->context;
-    DS_AudioDecoder_Destroy(ds_adec);
-}
-
-static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
-{
-  int skip;
-    switch(cmd)
-    {
-      case ADCTRL_SKIP_FRAME:
-		    skip=sh_audio->wf->nBlockAlign;
-		    if(skip<16){
-		      skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7);
-		      if(skip<16) skip=16;
-		    }
-		    demux_read_data(sh_audio->ds,NULL,skip);
-	  return CONTROL_TRUE;
-    }
-  return CONTROL_UNKNOWN;
-}
-
-static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
-{
-	DS_AudioDecoder* ds_adec = sh_audio->context;
-//	int len=-1;
-        int size_in=0;
-        int size_out=0;
-        int srcsize=DS_AudioDecoder_GetSrcSize(ds_adec, maxlen);
-        mp_msg(MSGT_DECAUDIO,MSGL_DBG3,"DShow says: srcsize=%d  (buffsize=%d)  out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,maxlen);
-        if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!!
-        if(sh_audio->a_in_buffer_len<srcsize){
-          sh_audio->a_in_buffer_len+=
-            demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
-            srcsize-sh_audio->a_in_buffer_len);
-        }
-        DS_AudioDecoder_Convert(ds_adec, sh_audio->a_in_buffer,sh_audio->a_in_buffer_len,
-            buf,maxlen, &size_in,&size_out);
-        mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"DShow: audio %d -> %d converted  (in_buf_len=%d of %d)  %d\n",size_in,size_out,sh_audio->a_in_buffer_len,sh_audio->a_in_buffer_size,ds_tell_pts(sh_audio->ds));
-        if(size_in>=sh_audio->a_in_buffer_len){
-          sh_audio->a_in_buffer_len=0;
-        } else {
-          sh_audio->a_in_buffer_len-=size_in;
-          memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len);
-        }
-//        len=size_out;
-  return size_out;
-}
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c
deleted file mode 100644
index 1edd87cd17..0000000000
--- a/libmpcodecs/ad_qtaudio.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <inttypes.h>
-
-#include "config.h"
-#include "mp_msg.h"
-#include "mpbswap.h"
-#include "ad_internal.h"
-
-#ifdef CONFIG_QUICKTIME
-#include <QuickTime/QuickTimeComponents.h>
-#else
-#include "loader/ldt_keeper.h"
-#include "loader/wine/winbase.h"
-#include "loader/wine/windef.h"
-#endif
-
-static const ad_info_t info = {
-	"QuickTime Audio Decoder",
-	"qtaudio",
-	"A'rpi",
-	"Sascha Sommer",
-	"uses win32 quicktime DLLs"
-};
-
-LIBAD_EXTERN(qtaudio)
-
-#ifndef CONFIG_QUICKTIME
-typedef struct OpaqueSoundConverter*    SoundConverter;
-typedef unsigned long                   OSType;
-typedef unsigned long                   UnsignedFixed;
-typedef uint8_t                          Byte;
-typedef struct SoundComponentData {
-    long                            flags;
-    OSType                          format;
-    short                           numChannels;
-    short                           sampleSize;
-    UnsignedFixed                   sampleRate;
-    long                            sampleCount;
-    Byte *                          buffer;
-    long                            reserved;
-}SoundComponentData;
-
-typedef int (__cdecl* LPFUNC1)(long flag);
-typedef int (__cdecl* LPFUNC2)(const SoundComponentData *, const SoundComponentData *,SoundConverter *);
-typedef int (__cdecl* LPFUNC3)(SoundConverter sc);
-typedef int (__cdecl* LPFUNC4)(void);
-typedef int (__cdecl* LPFUNC5)(SoundConverter sc, OSType selector,void * infoPtr);
-typedef int (__cdecl* LPFUNC6)(SoundConverter sc,
-								unsigned long inputBytesTarget,
-								unsigned long *inputFrames,
-								unsigned long *inputBytes,
-								unsigned long *outputBytes );
-typedef int (__cdecl* LPFUNC7)(SoundConverter sc,
-								const void    *inputPtr,
-								unsigned long inputFrames,
-								void          *outputPtr,
-								unsigned long *outputFrames,
-								unsigned long *outputBytes );
-typedef int (__cdecl* LPFUNC8)(SoundConverter sc,
-								void      *outputPtr,
-                                unsigned long *outputFrames,
-                                unsigned long *outputBytes);
-typedef int (__cdecl* LPFUNC9)(SoundConverter         sc) ;
-
-static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
-static HINSTANCE qtml_dll;
-static LPFUNC1 InitializeQTML;
-static LPFUNC2 SoundConverterOpen;
-static LPFUNC3 SoundConverterClose;
-static LPFUNC4 TerminateQTML;
-static LPFUNC5 SoundConverterSetInfo;
-static LPFUNC6 SoundConverterGetBufferSizes;
-static LPFUNC7 SoundConverterConvertBuffer;
-static LPFUNC8 SoundConverterEndConversion;
-static LPFUNC9 SoundConverterBeginConversion;
-
-#define siDecompressionParams 2002876005 // siDecompressionParams = FOUR_CHAR_CODE('wave')
-
-static int loader_init(void)
-{
-
-#ifdef WIN32_LOADER
-    Setup_LDT_Keeper();
-#endif
-    //preload quicktime.qts to avoid the problems caused by the hardcoded path inside the dll
-    qtime_qts = LoadLibraryA("QuickTime.qts");
-    if( qtime_qts == (HMODULE)NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading QuickTime.qts\n" );
-        return 1;
-    }
-    qtml_dll = LoadLibraryA("qtmlClient.dll");
-    if( qtml_dll == (HMODULE)NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading qtmlClient.dll\n" );
-	return 1;
-    }
-    InitializeQTML = (LPFUNC1)GetProcAddress(qtml_dll,"InitializeQTML");
-	if ( InitializeQTML == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed geting proc address InitializeQTML\n");
-		return 1;
-    }
-    SoundConverterOpen = (LPFUNC2)GetProcAddress(qtml_dll,"SoundConverterOpen");
-	if ( SoundConverterOpen == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterOpen\n");
-		return 1;
-    }
-	SoundConverterClose = (LPFUNC3)GetProcAddress(qtml_dll,"SoundConverterClose");
-	if ( SoundConverterClose == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterClose\n");
-		return 1;
-    }
-	TerminateQTML = (LPFUNC4)GetProcAddress(qtml_dll,"TerminateQTML");
-	if ( TerminateQTML == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address TerminateQTML\n");
-		return 1;
-    }
-	SoundConverterSetInfo = (LPFUNC5)GetProcAddress(qtml_dll,"SoundConverterSetInfo");
-	if ( SoundConverterSetInfo == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterSetInfo\n");
-		return 1;
-    }
-	SoundConverterGetBufferSizes = (LPFUNC6)GetProcAddress(qtml_dll,"SoundConverterGetBufferSizes");
-	if ( SoundConverterGetBufferSizes == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterGetBufferSizes\n");
-		return 1;
-    }
-	SoundConverterConvertBuffer = (LPFUNC7)GetProcAddress(qtml_dll,"SoundConverterConvertBuffer");
-	if ( SoundConverterConvertBuffer == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterConvertBuffer1\n");
-		return 1;
-    }
-	SoundConverterEndConversion = (LPFUNC8)GetProcAddress(qtml_dll,"SoundConverterEndConversion");
-	if ( SoundConverterEndConversion == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterEndConversion\n");
-		return 1;
-    }
-	SoundConverterBeginConversion = (LPFUNC9)GetProcAddress(qtml_dll,"SoundConverterBeginConversion");
-	if ( SoundConverterBeginConversion == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterBeginConversion\n");
-		return 1;
-    }
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n");
-	return 0;
-}
-#endif /* #ifndef CONFIG_QUICKTIME */
-
-static SoundConverter			   myConverter = NULL;
-static SoundComponentData		   InputFormatInfo,OutputFormatInfo;
-
-static int InFrameSize;
-static int OutFrameSize;
-
-static int preinit(sh_audio_t *sh){
-    int error;
-    unsigned long FramesToGet=0; //how many frames the demuxer has to get
-    unsigned long InputBufferSize=0; //size of the input buffer
-    unsigned long OutputBufferSize=0; //size of the output buffer
-    unsigned long WantedBufferSize=0; //the size you want your buffers to be
-    void* codecdata = sh->codecdata;
-
-    if (!sh->codecdata_len && sh->wf && sh->wf->cbSize){
-        codecdata = sh->wf + 1;
-    }
-
-#ifdef CONFIG_QUICKTIME
-    EnterMovies();
-#else
-    if(loader_init()) return 0; // failed to load DLL
-
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE!\n");
-
-    error = InitializeQTML(6+16);
-    if(error){
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"InitializeQTML:%i\n",error);
-        return 0;
-    }
-#endif
-
-	OutputFormatInfo.flags = InputFormatInfo.flags = 0;
-	OutputFormatInfo.sampleCount = InputFormatInfo.sampleCount = 0;
-	OutputFormatInfo.buffer = InputFormatInfo.buffer = NULL;
-	OutputFormatInfo.reserved = InputFormatInfo.reserved = 0;
-	OutputFormatInfo.numChannels = InputFormatInfo.numChannels = sh->wf->nChannels;
-	InputFormatInfo.sampleSize = sh->wf->wBitsPerSample;
-	OutputFormatInfo.sampleSize = 16;
-	OutputFormatInfo.sampleRate = InputFormatInfo.sampleRate = sh->wf->nSamplesPerSec;
-	InputFormatInfo.format =  bswap_32(sh->format); //1363430706;///*1768775988;//*/1902406962;//qdm2//1768775988;//FOUR_CHAR_CODE('ima4');
-	OutputFormatInfo.format = 1313820229;// FOUR_CHAR_CODE('NONE');
-
-    error = SoundConverterOpen(&InputFormatInfo, &OutputFormatInfo, &myConverter);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterOpen:%i\n",error);
-    if(error) return 0;
-
-    if(codecdata){
-	error = SoundConverterSetInfo(myConverter,siDecompressionParams,codecdata);
-	mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterSetInfo:%i\n",error);
-//	if(error) return 0;
-    }
-
-    WantedBufferSize=OutputFormatInfo.numChannels*OutputFormatInfo.sampleRate*2;
-    error = SoundConverterGetBufferSizes(myConverter,
-	WantedBufferSize,&FramesToGet,&InputBufferSize,&OutputBufferSize);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterGetBufferSizes:%i\n",error);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"WantedBufferSize = %li\n",WantedBufferSize);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"InputBufferSize  = %li\n",InputBufferSize);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OutputBufferSize = %li\n",OutputBufferSize);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FramesToGet = %li\n",FramesToGet);
-
-    InFrameSize=(InputBufferSize+FramesToGet-1)/FramesToGet;
-    OutFrameSize=OutputBufferSize/FramesToGet;
-
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FrameSize: %i -> %i\n",InFrameSize,OutFrameSize);
-
-    error = SoundConverterBeginConversion(myConverter);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterBeginConversion:%i\n",error);
-    if(error) return 0;
-
-    sh->audio_out_minsize=OutputBufferSize;
-    sh->audio_in_minsize=InputBufferSize;
-
-    sh->channels=sh->wf->nChannels;
-    sh->samplerate=sh->wf->nSamplesPerSec;
-    sh->samplesize=2; //(sh->wf->wBitsPerSample+7)/8;
-
-    sh->i_bps=sh->wf->nAvgBytesPerSec;
-//InputBufferSize*WantedBufferSize/OutputBufferSize;
-
-   if(sh->format==0x3343414D){
-       // MACE 3:1
-       sh->ds->ss_div = 2*3; // 1 samples/packet
-       sh->ds->ss_mul = sh->channels*2*1; // 1 bytes/packet
-   } else
-   if(sh->format==0x3643414D){
-       // MACE 6:1
-       sh->ds->ss_div = 2*6; // 1 samples/packet
-       sh->ds->ss_mul = sh->channels*2*1; // 1 bytes/packet
-   }
-
-  return 1; // return values: 1=OK 0=ERROR
-}
-
-static int init(sh_audio_t *sh_audio){
-
-    return 1; // return values: 1=OK 0=ERROR
-}
-
-static void uninit(sh_audio_t *sh){
-    int error;
-    unsigned long ConvertedFrames=0;
-    unsigned long ConvertedBytes=0;
-
-#if defined(WIN32_LOADER) && !defined(CONFIG_QUICKTIME)
-    Setup_FS_Segment();
-#endif
-
-    error=SoundConverterEndConversion(myConverter,NULL,&ConvertedFrames,&ConvertedBytes);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterEndConversion:%i\n",error);
-    error = SoundConverterClose(myConverter);
-    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterClose:%i\n",error);
-//    error = TerminateQTML();
-//    printf("TerminateQTML:%i\n",error);
-//    FreeLibrary( qtml_dll );
-//    qtml_dll = NULL;
-//    FreeLibrary( qtime_qts );
-//    qtime_qts = NULL;
-//    printf("qt dll loader uninit done\n");
-#ifdef CONFIG_QUICKTIME
-    ExitMovies();
-#endif
-}