Mercurial > mplayer.hg

comparison dec_audio.c @ 3182:95bbd21e8e1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved num_audio_channels out of LIBMAD ifdef, where it didn't belong!
author steve
date Wed, 28 Nov 2001 14:29:14 +0000
parents c8edb0691f09
children 6236baa23bde
comparison
equal deleted inserted replaced
3181:c8edb0691f09 3182:95bbd21e8e1f
33 #include "ac3-iec958.h" 33 #include "ac3-iec958.h"
34 34
35 #include "ima4.h" 35 #include "ima4.h"
36 36
37 #include "cpudetect.h" 37 #include "cpudetect.h"
38
39 /* used for ac3surround decoder - set using -channels option */
40 int audio_output_channels = 2;
38 41
39 #ifdef USE_FAKE_MONO 42 #ifdef USE_FAKE_MONO
40 int fakemono=0; 43 int fakemono=0;
41 #endif 44 #endif
42 45
80 #ifdef USE_LIBMAD 83 #ifdef USE_LIBMAD
81 #include <mad.h> 84 #include <mad.h>
82 static struct mad_stream mad_stream; 85 static struct mad_stream mad_stream;
83 static struct mad_frame mad_frame; 86 static struct mad_frame mad_frame;
84 static struct mad_synth mad_synth; 87 static struct mad_synth mad_synth;
85
86 /* used for ac3surround decoder - set using -channels option */
87 int audio_output_channels = 2;
88
89 88
90 // ensure buffer is filled with some data 89 // ensure buffer is filled with some data
91 static void mad_prepare_buffer(sh_audio_t* sh_audio, struct mad_stream* ms, int length) 90 static void mad_prepare_buffer(sh_audio_t* sh_audio, struct mad_stream* ms, int length)
92 { 91 {
93 if(sh_audio->a_in_buffer_len < length) { 92 if(sh_audio->a_in_buffer_len < length) {