Mercurial > mplayer.hg
comparison libmpdemux/demux_avs.c @ 22450:e466ca5fb2c1
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 | 4d81dbdf46b9 |
comparison
equal
deleted
inserted
replaced
22449:08774fd8fd17 | 22450:e466ca5fb2c1 |
---|---|
39 #endif | 39 #endif |
40 | 40 |
41 #include "demux_avs.h" | 41 #include "demux_avs.h" |
42 | 42 |
43 #define MAX_AVS_SIZE 16 * 1024 /* 16k should be enough */ | 43 #define MAX_AVS_SIZE 16 * 1024 /* 16k should be enough */ |
44 #undef ENABLE_AUDIO | |
45 | 44 |
46 HMODULE WINAPI LoadLibraryA(LPCSTR); | 45 HMODULE WINAPI LoadLibraryA(LPCSTR); |
47 FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); | 46 FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); |
48 int WINAPI FreeLibrary(HMODULE); | 47 int WINAPI FreeLibrary(HMODULE); |
49 | 48 |
329 { | 328 { |
330 sh_audio_t *sh_audio = new_sh_audio(demuxer, 0); | 329 sh_audio_t *sh_audio = new_sh_audio(demuxer, 0); |
331 found = 1; | 330 found = 1; |
332 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); | 331 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); |
333 | 332 |
334 #ifdef ENABLE_AUDIO | |
335 if (demuxer->audio->id == -1) demuxer->audio->id = 0; | 333 if (demuxer->audio->id == -1) demuxer->audio->id = 0; |
336 #else | |
337 if (demuxer->audio->id == -1) demuxer->audio->id = -2; | |
338 #endif | |
339 if (demuxer->audio->id == 0) | 334 if (demuxer->audio->id == 0) |
340 demuxer->audio->sh = sh_audio; | 335 demuxer->audio->sh = sh_audio; |
341 sh_audio->ds = demuxer->audio; | 336 sh_audio->ds = demuxer->audio; |
342 | 337 |
343 sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); | 338 sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); |