diff options
| author | steve <steve@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-28 14:29:14 +0000 |
|---|---|---|
| committer | steve <steve@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-28 14:29:14 +0000 |
| commit | 95ae50149c5005e775132acd34897c3f7d882021 (patch) | |
| tree | f9ff167f01f2735f32c1fc1b278d83b9c431053c /dec_audio.c | |
| parent | f6ee7f826c787b760deeab4403f206fa0f4581cf (diff) | |
| download | mpv-95ae50149c5005e775132acd34897c3f7d882021.tar.bz2 mpv-95ae50149c5005e775132acd34897c3f7d882021.tar.xz | |
moved num_audio_channels out of LIBMAD ifdef, where it didn't belong!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3183 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_audio.c')
| -rw-r--r-- | dec_audio.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dec_audio.c b/dec_audio.c index 52de2bebf2..f9b1742f76 100644 --- a/dec_audio.c +++ b/dec_audio.c @@ -36,6 +36,9 @@ extern int verbose; // defined in mplayer.c #include "cpudetect.h" +/* used for ac3surround decoder - set using -channels option */ +int audio_output_channels = 2; + #ifdef USE_FAKE_MONO int fakemono=0; #endif @@ -83,10 +86,6 @@ static struct mad_stream mad_stream; static struct mad_frame mad_frame; static struct mad_synth mad_synth; -/* used for ac3surround decoder - set using -channels option */ -int audio_output_channels = 2; - - // ensure buffer is filled with some data static void mad_prepare_buffer(sh_audio_t* sh_audio, struct mad_stream* ms, int length) { |