Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.79
diff -u -r1.79 vo_fbdev.c
--- vo_fbdev.c	19 Apr 2003 18:57:16 -0000	1.79
+++ vo_fbdev.c	1 Jun 2003 22:17:04 -0000
@@ -1093,9 +1093,6 @@
 	    }
 	    if (fs || vm)
 		memset(frame_buffer, '\0', fb_line_len * fb_yres);
-
-	    if (format == IMGFMT_YV12)
-		yuv2rgb_init(fb_bpp, MODE_RGB);
 	}
 	if (vt_doit && (vt_fd = open("/dev/tty", O_WRONLY)) == -1) {
 		printf(FBDEV "can't open /dev/tty: %s\n", strerror(errno));
@@ -1132,8 +1129,6 @@
 		else if (bpp == 24 && fb_bpp == 32)
 			return ret;
 	}
-	//if (format == IMGFMT_YV12)
-	//	return ret;
 	return 0;
 }
 
@@ -1143,35 +1138,15 @@
 	unsigned char *dst;
 	int dstride;
 
-#ifdef USE_CONVERT2FB
-	if (pixel_format == IMGFMT_YV12) {
-	  dst = L123123875 + (fb_xres * y0 + x0) * fb_pixel_size;
-	  dstride = fb_xres * fb_pixel_size;
-	}
-	else
-#endif
-	  {
 	    dst = next_frame + (in_width * y0 + x0) * fb_pixel_size;
 	    dstride = in_width * fb_pixel_size;
-	  }
 
 	(*draw_alpha_p)(w, h, src, srca, stride, dst, dstride);
 }
 
 static uint32_t draw_frame(uint8_t *src[])
 {
-	if (pixel_format == IMGFMT_YV12) {
-#ifdef USE_CONVERT2FB
-		yuv2rgb(L123123875, src[0], src[1], src[2], fb_xres,
-				fb_yres, fb_xres * fb_pixel_size,
-				in_width, in_width / 2);
-#else
-		yuv2rgb(next_frame, src[0], src[1], src[2], in_width,
-				in_height, in_width * fb_pixel_size,
-				in_width, in_width / 2);
-#endif
-
-	} else if (flip) {
+	if (flip) {
 		int h = in_height;
 		int len = in_width * fb_pixel_size;
 		char *d = next_frame + (in_height - 1) * len;
@@ -1200,21 +1175,6 @@
 {
 	uint8_t *dest;
 
-#ifdef USE_CONVERT2FB
-	if (pixel_format == IMGFMT_YV12) {
-	  if(x < fb_xres && y < fb_yres) {
-	    if(x+w > fb_xres) w= fb_xres-x;
-	    if(y+h > fb_yres) h= fb_yres-y;
-
-	    dest = L123123875 + (fb_xres * y + x) * fb_pixel_size;
-	    yuv2rgb(dest, src[0], src[1], src[2], w, h, fb_xres * fb_pixel_size,
-		    stride[0], stride[1]);
-	  }
-
-	  return 0;
-	}
-#endif
-
 	dest = next_frame + (in_width * y + x) * fb_pixel_size;
 	yuv2rgb(dest, src[0], src[1], src[2], w, h, in_width * fb_pixel_size,
 			stride[0], stride[1]);
@@ -1225,14 +1185,14 @@
 {
 }
 
-static void put_frame(void)
+static void draw_osd(void)
 {
-	int i, out_offset = 0, in_offset = 0;
+	vo_draw_text(in_width, in_height, draw_alpha);
+}
 
-#ifdef USE_CONVERT2FB
-	if(pixel_format == IMGFMT_YV12)
-	  return;
-#endif
+static void flip_page(void)
+{
+	int i, out_offset = 0, in_offset = 0;
 
 	for (i = 0; i < in_height; i++) {
 		memcpy(L123123875 + out_offset, next_frame + in_offset,
@@ -1240,16 +1200,6 @@
 		out_offset += fb_line_len;
 		in_offset += in_width * fb_pixel_size;
 	}
-}
-
-static void draw_osd(void)
-{
-	vo_draw_text(in_width, in_height, draw_alpha);
-}
-
-static void flip_page(void)
-{
-	put_frame();
 }
 
 static void uninit(void)