[Mplayer-cvslog] CVS: main dec_audio.c,1.53,1.54

Stephen Davies steve at mplayer.dev.hu
Wed Nov 28 15:29:17 CET 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv9383

Modified Files:
	dec_audio.c 
Log Message:
moved num_audio_channels out of LIBMAD ifdef, where it didn't belong!

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- dec_audio.c	28 Nov 2001 12:43:13 -0000	1.53
+++ dec_audio.c	28 Nov 2001 14:29:14 -0000	1.54
@@ -36,6 +36,9 @@
 
 #include "cpudetect.h"
 
+/* used for ac3surround decoder - set using -channels option */
+int audio_output_channels = 2;
+
 #ifdef USE_FAKE_MONO
 int fakemono=0;
 #endif
@@ -82,10 +85,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)




More information about the MPlayer-cvslog mailing list