diff options
| -rw-r--r-- | libvo/vo_x11.c | 22 | ||||
| -rw-r--r-- | libvo/vo_xv.c | 3 |
2 files changed, 2 insertions, 23 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 2bc17543de..a384c6f3f3 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -638,27 +638,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h, 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) diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 684d543c72..1019036476 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -551,8 +551,7 @@ static int draw_slice(uint8_t * image[], int stride[], int w, int h, 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) |