diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
index af94210135..f883612651 100644
--- a/libvo/vo_gif89a.c
+++ b/libvo/vo_gif89a.c
@@ -79,7 +79,7 @@ static uint32_t config
 	case IMGFMT_RGB24:
 	break;     
 	case IMGFMT_YV12:
-	     yuv2rgb_init(24, MODE_RGB);
+	     yuv2rgb_init(24, MODE_BGR);
 	     image_data = malloc(image_width*image_height*3);
 	break;
 	default:
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c
index 51af4f91f4..be57e0e339 100644
--- a/libvo/vo_jpeg.c
+++ b/libvo/vo_jpeg.c
@@ -191,17 +191,6 @@ static void flip_page (void)
 
 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y )
 {
-  // hack: swap planes for I420 ;) -- alex 
- if ((image_format == IMGFMT_IYUV) || (image_format == IMGFMT_I420))
-  {
-   uint8_t *src_i420[3];
-    
-   src_i420[0]=src[0];
-   src_i420[1]=src[2];
-   src_i420[2]=src[1];
-   src=src_i420;
-  }
-
  if (scale_srcW) 
   {
    uint8_t *dst[3]={image_data, NULL, NULL};