diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-01 13:14:54 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-01 13:14:54 +0000 |
| commit | ad8ea46df17d4d30cfc08a6e0f8b804097cedf14 (patch) | |
| tree | 1648616553587ae045f03c78497479515decaf95 /libmpcodecs/ad_dshow.c | |
| parent | 2870aa4331e6c4a4dc17aafcf1fa99c0d1b6eb23 (diff) | |
| download | mpv-ad8ea46df17d4d30cfc08a6e0f8b804097cedf14.tar.bz2 mpv-ad8ea46df17d4d30cfc08a6e0f8b804097cedf14.tar.xz | |
using sh->context and added proper uninit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5449 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ad_dshow.c')
| -rw-r--r-- | libmpcodecs/ad_dshow.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpcodecs/ad_dshow.c b/libmpcodecs/ad_dshow.c index ff770ca094..3358c498be 100644 --- a/libmpcodecs/ad_dshow.c +++ b/libmpcodecs/ad_dshow.c @@ -24,8 +24,6 @@ LIBAD_EXTERN(dshow) #include "dshow/DS_AudioDecoder.h" -static DS_AudioDecoder* ds_adec=NULL; - static int init(sh_audio_t *sh) { return 1; @@ -33,6 +31,7 @@ static int init(sh_audio_t *sh) 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_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_audio->codec->dll); @@ -47,6 +46,7 @@ static int preinit(sh_audio_t *sh_audio) sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); sh_audio->a_in_buffer_len=0; 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; @@ -54,7 +54,8 @@ static int preinit(sh_audio_t *sh_audio) static void uninit(sh_audio_t *sh) { - // TODO!!! + DS_AudioDecoder* ds_adec = sh->context; + DS_AudioDecoder_Destroy(ds_adec); } static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...) @@ -76,6 +77,7 @@ static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...) 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; |