summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ad_acm.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-22 00:43:14 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-22 00:43:14 +0000
commit61c5a99851ea41449a513619dd68791c93e30ef3 (patch)
treedca11ab9a0e1c6948e2638b9898f235556187cc5 /libmpcodecs/ad_acm.c
parent2059c26359a74ba82f26e57cd88851bdce377214 (diff)
downloadmpv-61c5a99851ea41449a513619dd68791c93e30ef3.tar.bz2
mpv-61c5a99851ea41449a513619dd68791c93e30ef3.tar.xz
wine headers cleanup
- WAVEFORMATEX & BITMAPINFOHEADER decl moved to stheader.h - lots of useless include wine/* removed from mplayer code - fixed few warnings git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7472 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ad_acm.c')
-rw-r--r--libmpcodecs/ad_acm.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c
index 6f46675025..29cfe412c3 100644
--- a/libmpcodecs/ad_acm.c
+++ b/libmpcodecs/ad_acm.c
@@ -8,10 +8,7 @@
#ifdef USE_WIN32DLL
-#include "loader.h"
-//#include "wine/mmreg.h"
-#include "wine/vfw.h"
-#include "wine/avifmt.h"
+#include "wineacm.h"
#include "ad_internal.h"
@@ -144,10 +141,10 @@ static void uninit(sh_audio_t *sh)
return(uninit(sh));
case ACMERR_UNPREPARED:
case ACMERR_NOTPOSSIBLE:
- return(0);
+ return;
default:
mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occured: %d\n", ret);
- return(0);
+ return;
}
MSACM_UnregisterAllDrivers();