Mercurial > mplayer.hg
changeset 542:7eaec864e3d2
doesn't include fastmemcpy.h when SDL_NOXV is defined.
(otherwise MPlayer crashes in fastmemcpy.h, needs to be FIXED!)
| author | atmosfear |
|---|---|
| date | Fri, 20 Apr 2001 09:06:49 +0000 |
| parents | b382156bff40 |
| children | ee0010d0ca81 |
| files | libvo/vo_sdl.c |
| diffstat | 1 files changed, 18 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_sdl.c Fri Apr 20 06:15:43 2001 +0000 +++ b/libvo/vo_sdl.c Fri Apr 20 09:06:49 2001 +0000 @@ -73,6 +73,13 @@ * to update this all the time. */ +/* define if you want to force Xv SDL output? */ +#undef SDL_FORCEXV +/* define to force software-surface (video surface stored in system memory)*/ +#undef SDL_NOHWSURFACE +/* define to disable usage of the xvideo extension */ +#undef SDL_NOXV + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -82,20 +89,16 @@ #include "video_out.h" #include "video_out_internal.h" +/* FIXME: MPlayer crashes in fastmemcpy.h when SDL_NOXV is defined! */ +#ifndef SDL_NOXV #include "fastmemcpy.h" +#endif LIBVO_EXTERN(sdl) //#include "log.h" //#define LOG if(0)printf -/* define if you want to force Xv SDL output? */ -#undef SDL_FORCEXV -/* define to force software-surface (video surface stored in system memory)*/ -#undef SDL_NOHWSURFACE -/* define to disable usage of the xvideo extension */ -#undef SDL_NOXV - static vo_info_t vo_info = { "SDL YUV overlay (SDL v1.1.7+ only!)", @@ -385,22 +388,22 @@ sdl_format = format; switch(format){ case IMGFMT_YV12: - printf("\nSDL: Using 0x%X (YV12) image format\n", format); break; + printf("SDL: Using 0x%X (YV12) image format\n", format); break; case IMGFMT_IYUV: - printf("\nSDL: Using 0x%X (IYUV) image format\n", format); break; + printf("SDL: Using 0x%X (IYUV) image format\n", format); break; case IMGFMT_YUY2: - printf("\nSDL: Using 0x%X (YUY2) image format\n", format); break; + printf("SDL: Using 0x%X (YUY2) image format\n", format); break; case IMGFMT_UYVY: - printf("\nSDL: Using 0x%X (UYVY) image format\n", format); break; + printf("SDL: Using 0x%X (UYVY) image format\n", format); break; case IMGFMT_YVYU: - printf("\nSDL: Using 0x%X (YVYU) image format\n", format); break; + printf("SDL: Using 0x%X (YVYU) image format\n", format); break; case IMGFMT_I420: - printf("\nSDL: Using 0x%X (I420) image format\n", format); - printf("SDL: Mapping I420 to IYUV (untested please report if it works)\n"); + printf("SDL: Using 0x%X (I420) image format\n", format); + printf("SDL: Mapping I420 to IYUV\n"); sdl_format = SDL_IYUV_OVERLAY; break; default: - printf("\nSDL: Unsupported image format (0x%X)\n",format); + printf("SDL: Unsupported image format (0x%X)\n",format); return -1; }