[Mplayer-cvslog] CVS: main/libvo vo_dxr3.c,1.79,1.80

David Holm mswitch at mplayer.dev.hu
Fri Apr 5 20:06:11 CEST 2002


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

Modified Files:
	vo_dxr3.c 
Log Message:
Make fame the default encoder until lavc's mpeg1 encoder is repaired.
Disable spu writes until lockup bug has been found.


Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- vo_dxr3.c	4 Apr 2002 16:35:03 -0000	1.79
+++ vo_dxr3.c	5 Apr 2002 18:05:57 -0000	1.80
@@ -136,10 +136,10 @@
 	MPG_CODEC_FAME
 };
 
-#if defined(USE_LIBAVCODEC)
-static int mpeg_codec = MPG_CODEC_AVCODEC;
-#elif defined(USE_LIBFAME)
+#if defined(USE_LIBFAME)
 static int mpeg_codec = MPG_CODEC_FAME;
+#elif defined(USE_LIBAVCODEC)
+static int mpeg_codec = MPG_CODEC_AVCODEC;
 #else
 static int mpeg_codec = MPG_CODEC_NONE;
 #endif
@@ -510,7 +510,7 @@
 		if (!noprebuf) {
 			ioctl(fd_spu, EM8300_IOCTL_SPU_SETPTS, &vo_pts);
 		}
-		write(fd_spu, spued->data, spued->count);
+		/*write(fd_spu, spued->data, spued->count);*/
 	}
 	disposd++;
 }




More information about the MPlayer-cvslog mailing list