diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-02 21:44:45 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-02 21:44:45 +0000 |
| commit | ce8be9282b1241efb1fdc9f20fa65ec7747ba1f6 (patch) | |
| tree | 32a8ad00b59bb82d96ebfc9e45a05926f20adb63 /dec_audio.c | |
| parent | b45d365ae4f04bd15dbcf9e88e991fc243d06cc5 (diff) | |
| download | mpv-ce8be9282b1241efb1fdc9f20fa65ec7747ba1f6.tar.bz2 mpv-ce8be9282b1241efb1fdc9f20fa65ec7747ba1f6.tar.xz | |
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2050 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_audio.c')
| -rw-r--r-- | dec_audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dec_audio.c b/dec_audio.c index d0352e52ea..699f7a8149 100644 --- a/dec_audio.c +++ b/dec_audio.c @@ -25,6 +25,8 @@ int fakemono=0; #include "codec-cfg.h" #include "stheader.h" +#include "dll_init.h" + #include "mp3lib/mp3.h" #include "libac3/ac3.h" @@ -51,8 +53,6 @@ int fakemono=0; extern int avcodec_inited; #endif -extern int init_acm_audio_codec(sh_audio_t *sh_audio); -extern int acm_decode_audio(sh_audio_t *sh_audio, void* a_buffer,int minlen,int maxlen); int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen); @@ -512,7 +512,7 @@ int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){ int len2=0; int x=ds_get_packet(sh_audio->ds,&start); if(x<=0) break; // error - y=avcodec_decode_audio(&lavc_context,buf,&len2,start,x); + y=avcodec_decode_audio(&lavc_context,(INT16*)buf,&len2,start,x); if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } if(y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) if(len2>0){ |