summaryrefslogtreecommitdiffstats
path: root/libvo/vo_dga.c
diff options
context:
space:
mode:
authornick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-30 17:04:31 +0000
committernick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-30 17:04:31 +0000
commit534dd3b7ce477250adb68209a33496f3dcf26e40 (patch)
treebd6ab4146a5e3f0af543d6d524625f5ca8f8a065 /libvo/vo_dga.c
parent9ee7852bb7488b68373a2ce36f3928a3832560a9 (diff)
downloadmpv-534dd3b7ce477250adb68209a33496f3dcf26e40.tar.bz2
mpv-534dd3b7ce477250adb68209a33496f3dcf26e40.tar.xz
Using new stuff of rgb15to16
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2557 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_dga.c')
-rw-r--r--libvo/vo_dga.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index dcaa2a1138..7226ad2069 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -23,8 +23,8 @@
* - works only on x86 architectures
*
* $Log$
- * Revision 1.30 2001/08/13 11:08:18 atlka
- * changes according to -utf8 option, draw_osd() function added
+ * Revision 1.31 2001/10/30 17:04:31 nick
+ * Using new stuff of rgb15to16
*
* Revision 1.29 2001/07/16 18:41:52 jkeil
* vo_dga doesn't compile on non-x86 architecture due to x86 asm usage.
@@ -151,11 +151,9 @@ LIBVO_EXTERN( dga )
#include "x11_common.h"
-
+#include "../postproc/rgb2rgb.h"
#include "fastmemcpy.h"
-extern void rgb15to16_mmx(char* s0,char* d0,int count);
-
static vo_info_t vo_info =
{
#ifdef HAVE_DGA2
@@ -479,18 +477,9 @@ static uint32_t draw_frame( uint8_t *src[] ){
int i;
char *e;
for(i=0; i< vo_dga_lines; i++){
-#ifdef HAVE_MMX
- rgb15to16_mmx( s, d, vo_dga_bytes_per_line);
+ rgb15to16( s, d, vo_dga_bytes_per_line);
d+=vo_dga_bytes_per_line;
s+=vo_dga_bytes_per_line;
-#else
- e = s+vo_dga_bytes_per_line;
- while( s< e ){
- register uint16_t x = *(((uint16_t *)s)++);
- *(((uint16_t *)d)++)=( x&0x001F )|( ( x&0x7FE0 )<<1 );
- }
-
-#endif
d+= vo_dga_vp_skip;
}
}