Mercurial > mplayer.hg
changeset 27883:96831cf06109
Remove code from unused and since ages deprecated draw_frame function.
author | reimar |
---|---|
date | Sat, 15 Nov 2008 16:40:48 +0000 |
parents | a875d666fee2 |
children | ad43c827bf24 |
files | libvo/vo_x11.c libvo/vo_xv.c |
diffstat | 2 files changed, 2 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_x11.c Sat Nov 15 16:36:39 2008 +0000 +++ b/libvo/vo_x11.c Sat Nov 15 16:40:48 2008 +0000 @@ -638,27 +638,7 @@ 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)
--- a/libvo/vo_xv.c Sat Nov 15 16:36:39 2008 +0000 +++ b/libvo/vo_xv.c Sat Nov 15 16:40:48 2008 +0000 @@ -551,8 +551,7 @@ 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)