Mercurial > mplayer.hg
comparison libvo/vo_x11.c @ 18234:a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
| author | reynaldo |
|---|---|
| date | Mon, 24 Apr 2006 04:23:53 +0000 |
| parents | d75953576ae4 |
| children | 30d7ddf08889 |
comparison
equal
deleted
inserted
replaced
| 18233:30fcc199bec7 | 18234:a107276371a8 |
|---|---|
| 42 #include "postproc/swscale_internal.h" //FIXME | 42 #include "postproc/swscale_internal.h" //FIXME |
| 43 #include "postproc/rgb2rgb.h" | 43 #include "postproc/rgb2rgb.h" |
| 44 #include "libmpcodecs/vf_scale.h" | 44 #include "libmpcodecs/vf_scale.h" |
| 45 | 45 |
| 46 #include "mp_msg.h" | 46 #include "mp_msg.h" |
| 47 #include "help_mp.h" | |
| 47 | 48 |
| 48 #ifdef HAVE_NEW_GUI | 49 #ifdef HAVE_NEW_GUI |
| 49 #include "Gui/interface.h" | 50 #include "Gui/interface.h" |
| 50 #include "mplayer.h" | 51 #include "mplayer.h" |
| 51 #endif | 52 #endif |
| 652 else if (in_format == IMGFMT_BGR32) | 653 else if (in_format == IMGFMT_BGR32) |
| 653 stride[0] = srcW * 4; | 654 stride[0] = srcW * 4; |
| 654 | 655 |
| 655 return draw_slice(src, stride, srcW, srcH, 0, 0); | 656 return draw_slice(src, stride, srcW, srcH, 0, 0); |
| 656 #else | 657 #else |
| 657 printf("draw_frame() called!!!!!!\n"); | 658 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_X11_DrawFrameCalled); |
| 658 return -1; | 659 return -1; |
| 659 #endif | 660 #endif |
| 660 } | 661 } |
| 661 | 662 |
| 662 static uint32_t get_image(mp_image_t * mpi) | 663 static uint32_t get_image(mp_image_t * mpi) |