# HG changeset patch # User reimar # Date 1173101346 0 # Node ID e466ca5fb2c1282702be711ca24dee1bb613470d # Parent 08774fd8fd1712e9b97a984edaa9406c409cc1bc Audio should now work fine, so remove the ENABLE_AUDIO ifdef diff -r 08774fd8fd17 -r e466ca5fb2c1 libmpdemux/demux_avs.c --- a/libmpdemux/demux_avs.c Mon Mar 05 13:27:42 2007 +0000 +++ b/libmpdemux/demux_avs.c Mon Mar 05 13:29:06 2007 +0000 @@ -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 @@ 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;