[Mplayer-cvslog] CVS: main/libvo vo_zr.c,1.25,1.26 vosub_vidix.c,1.58,1.59

[Alex Beregszaszi]

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

Modified Files:
	vo_zr.c vosub_vidix.c 
Log Message:
1000l

Index: vo_zr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vo_zr.c	13 Aug 2003 16:29:32 -0000	1.25
+++ vo_zr.c	14 Aug 2003 01:24:17 -0000	1.26
@@ -304,7 +304,7 @@
 	framenum = 0;
 	if (format != IMGFMT_YV12 && format != IMGFMT_YUY2) {
 		printf("vo_zr called with wrong format");
-		exit(1);
+		return 1;
 	}
 	for (i = 0; i < zr_count; i++) {
 		zr_info_t *zr = &zr_info[i];

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- vosub_vidix.c	9 Jun 2003 12:15:47 -0000	1.58
+++ vosub_vidix.c	14 Aug 2003 01:24:17 -0000	1.59
@@ -35,7 +35,6 @@
 #include "../libmpcodecs/mp_image.h"
 
 #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
-#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
 
 static VDL_HANDLE vidix_handler = NULL;
 static uint8_t *vidix_mem = NULL;
@@ -205,8 +204,6 @@
     uint8_t *src;
     uint8_t *dest;
 
-    UNUSED(w);
-    UNUSED(stride);
     dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
     dest += dstrides.y*y + x;
     src = image[0];
@@ -250,16 +247,8 @@
 
 uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
-	UNUSED(image);
-	UNUSED(stride);
-	UNUSED(w);
-	UNUSED(h);
-	UNUSED(x);
-	UNUSED(y);
-	printf("vosub_vidix: Error unoptimized draw_slice was called\nExiting...");
-	vidix_term();
-	exit( EXIT_FAILURE );
-	return 0;
+    printf("vosub_vidix: dummy vidix_draw_slice() was called\n");
+    return -1;
 }
 
 static uint32_t  vidix_draw_image(mp_image_t *mpi){
@@ -275,7 +264,7 @@
 
 uint32_t vidix_draw_frame(uint8_t *image[])
 {
-  printf("vosub_vidix: vidix_draw_frame() was called!!!!\n");
+  printf("vosub_vidix: dummy vidix_draw_frame() was called\n");
   return -1;
 }