From 534dd3b7ce477250adb68209a33496f3dcf26e40 Mon Sep 17 00:00:00 2001
From: nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 30 Oct 2001 17:04:31 +0000
Subject: Using new stuff of rgb15to16

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2557 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_fbdev.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'libvo/vo_fbdev.c')

diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 3ada5dcfb7..be3a747990 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -28,6 +28,7 @@
 #include "fastmemcpy.h"
 #include "sub.h"
 #include "yuv2rgb.h"
+#include "../postproc/rgb2rgb.h"
 
 LIBVO_EXTERN(fbdev)
 
@@ -38,7 +39,6 @@ static vo_info_t vo_info = {
 	""
 };
 
-extern void rgb15to16_mmx(char *s0, char *d0, int count);
 extern int verbose;
 
 /******************************
@@ -1146,20 +1146,10 @@ static uint32_t draw_frame(uint8_t *src[])
 		char *d = next_frame;
 		char *s = src[0];
 		if (sbpp == fb_pixel_size) {
-			if (fb_real_bpp == 16 && pixel_format == (IMGFMT_BGR|15)) {
-#ifdef HAVE_MMX
-				rgb15to16_mmx(s, d, 2 * in_width * in_height);
-#else
-				unsigned short *s1 = (unsigned short *) s;
-				unsigned short *d1 = (unsigned short *) d;
-				unsigned short *e = s1 + in_width * in_height;
-				while (s1<e) {
-					register x = *(s1++);
-					*(d1++) = (x&0x001f)|((x&0x7fe0)<<1);
-				}
-#endif
-			} else
-				memcpy(d, s, sbpp * in_width * in_height);
+		    if (fb_real_bpp == 16 && pixel_format == (IMGFMT_BGR|15))
+			rgb15to16(s, d, 2 * in_width * in_height);
+		    else
+			memcpy(d, s, sbpp * in_width * in_height);
 		}
 	}
 	return 0;
-- 
cgit v1.2.3