From dd866c4d11dfe1f87b32844bc92792e929fb743e Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 5 Mar 2007 13:29:06 +0000 Subject: [PATCH] Audio should now work fine, so remove the ENABLE_AUDIO ifdef git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22468 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_avs.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index 23934235b5..d8ca99244a 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -41,7 +41,6 @@ #include "demux_avs.h" #define MAX_AVS_SIZE 16 * 1024 /* 16k should be enough */ -#undef ENABLE_AUDIO HMODULE WINAPI LoadLibraryA(LPCSTR); FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); @@ -331,11 +330,7 @@ static demuxer_t* demux_open_avs(demuxer_t* demuxer) found = 1; mp_msg(MSGT_DEMUX, MSGL_V, "AVS: Clip has audio -> Channels = %d - Freq = %d\n", AVS->video_info->nchannels, AVS->video_info->audio_samples_per_second); -#ifdef ENABLE_AUDIO if (demuxer->audio->id == -1) demuxer->audio->id = 0; -#else - if (demuxer->audio->id == -1) demuxer->audio->id = -2; -#endif if (demuxer->audio->id == 0) demuxer->audio->sh = sh_audio; sh_audio->ds = demuxer->audio;