[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.78,1.79

[Fredrik Kuivinen CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv18539

Modified Files:
	vo_sdl.c 
Log Message:
Two fixes:
- Planar formats don't use draw_frame. Code dealing with that has been removed.
- Calculate y_screen_bottom correctly


Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- vo_sdl.c	23 Mar 2002 10:24:51 -0000	1.78
+++ vo_sdl.c	24 Mar 2002 18:42:27 -0000	1.79
@@ -921,7 +921,7 @@
     /* Place the image in the middle of the screen */
     priv->y = (surfheight - priv->height) / 2;
     priv->y_screen_top = priv->y * v_scale;
-    priv->y_screen_bottom = (priv->y + priv->dstheight) * v_scale;
+    priv->y_screen_bottom = priv->y_screen_top + priv->dstheight;
 
     priv->dirty_off_frame[0].x = -1;
     priv->dirty_off_frame[0].y = -1;
@@ -1033,22 +1033,7 @@
 	int i;
 	uint8_t *mysrc = src[0];
 
-        switch(priv->format){
-        case IMGFMT_YV12:
-        case IMGFMT_I420:
-        case IMGFMT_IYUV:
-        SDL_OVR_LOCK(-1)
-            
-        dst = priv->overlay->pixels[0] + priv->y*priv->overlay->pitches[0];
-        memcpy(dst, src[0], priv->overlay->pitches[0]*priv->overlay->h);
-        dst = priv->overlay->pixels[1] + priv->y*priv->overlay->pitches[1]/2;
-        memcpy(dst, src[1], priv->overlay->pitches[1]*priv->overlay->h/2);
-        dst = priv->overlay->pixels[2] + priv->y*priv->overlay->pitches[2]/2;
-        memcpy(dst, src[2], priv->overlay->pitches[2]*priv->overlay->h/2);
-        
-	    SDL_OVR_UNLOCK
-            break;
-
+    switch(priv->format){
         case IMGFMT_YUY2:
         case IMGFMT_UYVY:
         case IMGFMT_YVYU: