[Mplayer-cvslog] CVS: main/libvo vo_dxr3.c,1.62,1.63

[David Holm]

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

Modified Files:
	vo_dxr3.c 
Log Message:
Fixed problem with seeking/sync when using libfame
libfame seems to not accept some standard fps rates, like 2997/100, this
causes bad syncing with fame sometimes =(


Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- vo_dxr3.c	15 Mar 2002 17:24:27 -0000	1.62
+++ vo_dxr3.c	16 Mar 2002 06:01:13 -0000	1.63
@@ -276,8 +276,8 @@
 		fame_params.quality = 100;
 		fame_params.bitrate = 0;
 		fame_params.slices_per_frame = 1;
-		fame_params.frames_per_sequence = 0xffffffff;
-		fame_params.frame_rate_num = 60;
+		fame_params.frames_per_sequence = 25;
+		fame_params.frame_rate_num = 25;
 		fame_params.frame_rate_den = 1;
 		fame_params.shape_quality = 100;
 		fame_params.search_range = 8;
@@ -309,7 +309,7 @@
 		} else {
 			avc_context->gop_size = 15;
 		}
-		avc_context->frame_rate = vo_fps * FRAME_RATE_BASE;
+		avc_context->frame_rate = (int) vo_fps * FRAME_RATE_BASE;
 		avc_context->bit_rate = 8e6;
 		avc_context->flags = CODEC_FLAG_HQ | CODEC_FLAG_QSCALE;
 		avc_context->quality = 2;
@@ -471,10 +471,6 @@
 	char devname[80];
 	int fdflags = O_WRONLY;
 
-/* With fame we loose sync and seeking =( */
-#ifdef USE_LIBFAME
-	noprebuf = 1;
-#endif
 	/* Open the control interface */
 	if (arg && !strcmp("noprebuf", arg)) {
 		printf("VO: [dxr3] Disabling prebuffering.\n");
@@ -544,8 +540,7 @@
 		}
 	}
 
-#ifdef USE_LIBFAME
-#elif USE_LIBAVCODEC
+#if !defined(USE_LIBFAME) && defined(USE_LIBAVCODEC)
 	avcodec_init();
 	avcodec_register_all();
 #endif