# HG changeset patch
# User atmosfear
# Date 987368891 0
# Node ID e27a365b030381c65ae71850acb49c41675ce170
# Parent  ce10c892074f4ee6746870eb683b2ba1eff901da
fixes osd/subtitle for UYVY image format and steps back to 1.15 changes

diff -r ce10c892074f -r e27a365b0303 libvo/vo_sdl.c
--- a/libvo/vo_sdl.c	Sun Apr 15 21:01:19 2001 +0000
+++ b/libvo/vo_sdl.c	Sun Apr 15 21:08:11 2001 +0000
@@ -156,10 +156,12 @@
     			vo_draw_alpha_yv12(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+priv->width*y0+x0,priv->width);
 		break;
 		case IMGFMT_YUY2:
-        	case IMGFMT_UYVY:
         	case IMGFMT_YVYU:		
     			vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+2*(priv->width*y0+x0),2*priv->width);
 		break;	
+        	case IMGFMT_UYVY:
+    			vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+2*(priv->width*y0+x0)+1,2*priv->width);
+		break;	
   	}	
 }
 
@@ -377,24 +379,27 @@
 	struct sdl_priv_s *priv = &sdl_priv;
         unsigned int sdl_format;
 
-
+	sdl_format = format;
         switch(format){
-          case IMGFMT_YV12:
-	  	sdl_format=SDL_YV12_OVERLAY;
-		printf("SDL: Using YV12 image format\n");
-	  break;
-          case IMGFMT_YUY2:
-	  	sdl_format=SDL_YUY2_OVERLAY;
-		printf("SDL: Using YUY2 image format\n");
-	  break;
-          case IMGFMT_UYVY:
-	  	sdl_format=SDL_UYVY_OVERLAY;
-		printf("SDL: Using UYVY image format\n");
-	  break;
-          default:
-            printf("SDL: Unsupported image format (0x%X)\n",format);
-            return -1;
-        }
+		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;
+	}
 
 	sdl_open (NULL, NULL);