Mercurial > mplayer.hg

changeset 22450:e466ca5fb2c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Audio should now work fine, so remove the ENABLE_AUDIO ifdef
author reimar
date Mon, 05 Mar 2007 13:29:06 +0000
parents 08774fd8fd17
children 86f7b9cab33b
files libmpdemux/demux_avs.c
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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;