[Mplayer-cvslog] CVS: main dec_audio.c,1.51,1.52

Michael Niedermayer michael at mplayer.dev.hu
Mon Nov 26 22:55:38 CET 2001


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

Modified Files:
	dec_audio.c 
Log Message:
runtime cpu detection


Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- dec_audio.c	30 Oct 2001 17:38:09 -0000	1.51
+++ dec_audio.c	26 Nov 2001 21:55:22 -0000	1.52
@@ -34,6 +34,8 @@
 
 #include "ima4.h"
 
+#include "cpudetect.h"
+
 #ifdef USE_FAKE_MONO
 int fakemono=0;
 #endif
@@ -53,7 +55,7 @@
 			  stream of packets */
   ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
   ogg_packet       op; /* one raw packet of data for decode */
-  
+
   vorbis_info      vi; /* struct that stores all the static vorbis bitstream
 			  settings */
   vorbis_comment   vc; /* struct that stores all the bitstream user comments */
@@ -329,12 +331,12 @@
   ac3_config.fill_buffer_callback = ac3_fill_buffer;
   ac3_config.num_output_ch = 2;
   ac3_config.flags = 0;
-#ifdef HAVE_MMX
+if(gCpuCaps.hasMMX){
   ac3_config.flags |= AC3_MMX_ENABLE;
-#endif
-#ifdef HAVE_3DNOW
+}
+if(gCpuCaps.has3DNow){
   ac3_config.flags |= AC3_3DNOW_ENABLE;
-#endif
+}
   ac3_init();
   sh_audio->ac3_frame = ac3_decode_frame();
   if(sh_audio->ac3_frame){




More information about the MPlayer-cvslog mailing list