[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.18,1.19

[Felix Buenemann]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv27862

Modified Files:
	vo_sdl.c 
Log Message:
doesn't include fastmemcpy.h when SDL_NOXV is defined.
(otherwise MPlayer crashes in fastmemcpy.h, needs to be FIXED!)


Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** vo_sdl.c	2001/04/16 17:19:28	1.18
--- vo_sdl.c	2001/04/20 09:06:49	1.19
***************
*** 74,77 ****
--- 74,84 ----
   */
  
+ /* 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>
***************
*** 83,87 ****
--- 90,97 ----
  #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)
***************
*** 90,100 ****
  //#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 = 
  {
--- 100,103 ----
***************
*** 386,405 ****
          switch(format){
  		case IMGFMT_YV12:
! 			printf("\nSDL: Using 0x%X (YV12) image format\n", format); break;
  		case IMGFMT_IYUV:
! 			printf("\nSDL: Using 0x%X (IYUV) image format\n", format); break;
  		case IMGFMT_YUY2:
! 			printf("\nSDL: Using 0x%X (YUY2) image format\n", format); break;
  		case IMGFMT_UYVY:
! 			printf("\nSDL: Using 0x%X (UYVY) image format\n", format); break;
  		case IMGFMT_YVYU:
! 			printf("\nSDL: 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");
  			sdl_format = SDL_IYUV_OVERLAY;
  		break;	
  		default:
! 			printf("\nSDL: Unsupported image format (0x%X)\n",format);
  			return -1;
  	}
--- 389,408 ----
          switch(format){
  		case IMGFMT_YV12:
! 			printf("SDL: Using 0x%X (YV12) image format\n", format); break;
  		case IMGFMT_IYUV:
! 			printf("SDL: Using 0x%X (IYUV) image format\n", format); break;
  		case IMGFMT_YUY2:
! 			printf("SDL: Using 0x%X (YUY2) image format\n", format); break;
  		case IMGFMT_UYVY:
! 			printf("SDL: Using 0x%X (UYVY) image format\n", format); break;
  		case IMGFMT_YVYU:
! 			printf("SDL: Using 0x%X (YVYU) image format\n", format); break;
  		case IMGFMT_I420:
! 			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("SDL: Unsupported image format (0x%X)\n",format);
  			return -1;
  	}


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog