[MPlayer-cvslog] r27917 - in trunk/libvo: vo_x11.c vo_xv.c

[reimar]

Author: reimar
Date: Sat Nov 15 17:40:48 2008
New Revision: 27917

Log:
Remove code from unused and since ages deprecated draw_frame function.


Modified:
   trunk/libvo/vo_x11.c
   trunk/libvo/vo_xv.c

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	(original)
+++ trunk/libvo/vo_x11.c	Sat Nov 15 17:40:48 2008
@@ -638,27 +638,7 @@ static int draw_slice(uint8_t * src[], i
 
 static int draw_frame(uint8_t * src[])
 {
-#if 0
-    int stride[3] = { 0, 0, 0 };
-
-    if (in_format == IMGFMT_YUY2)
-        stride[0] = srcW * 2;
-    else if (in_format == IMGFMT_BGR8)
-        stride[0] = srcW;
-    else if (in_format == IMGFMT_BGR15)
-        stride[0] = srcW * 2;
-    else if (in_format == IMGFMT_BGR16)
-        stride[0] = srcW * 2;
-    else if (in_format == IMGFMT_BGR24)
-        stride[0] = srcW * 3;
-    else if (in_format == IMGFMT_BGR32)
-        stride[0] = srcW * 4;
-
-    return draw_slice(src, stride, srcW, srcH, 0, 0);
-#else
-    mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_X11_DrawFrameCalled);
-    return -1;
-#endif
+    return VO_ERROR;
 }
 
 static uint32_t get_image(mp_image_t * mpi)

Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c	(original)
+++ trunk/libvo/vo_xv.c	Sat Nov 15 17:40:48 2008
@@ -551,8 +551,7 @@ static int draw_slice(uint8_t * image[],
 
 static int draw_frame(uint8_t * src[])
 {
-    mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_XV_DrawFrameCalled);
-    return -1;
+    return VO_ERROR;
 }
 
 static uint32_t draw_image(mp_image_t * mpi)