- added support for UYVY chroma for directx direct vout render

diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c
index b34d0b85a89325f6db58289abdc4100356834209..ae997177cf9b05be2c1cd78cf26346d08fcccb04 100644 (file)
--- a/modules/video_output/directx/directx.c
+++ b/modules/video_output/directx/directx.c
@@ -1624,6 +1624,7 @@ static int UpdatePictureStruct( vout_thread_t *p_vout, picture_t *p_pic,
             p_pic->i_planes = 3;
             break;
 
+        case VLC_FOURCC('U','Y','V','Y'):
         case VLC_FOURCC('Y','U','Y','2'):
 
             p_pic->p->p_pixels = p_pic->p_sys->ddsd.lpSurface;

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 427ce00f79fbecfb760c1b5ec6a0b25a1743d701..535febf4c9e5804c5f42c952a4fb1ff3e1f71ae6 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -2,7 +2,7 @@
  * vout_pictures.c : picture management functions
  *****************************************************************************
  * Copyright (C) 2000-2004 VideoLAN
- * $Id: vout_pictures.c,v 1.47 2004/02/27 14:01:35 fenrir Exp $
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -518,6 +518,7 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
             break;
         case FOURCC_I422:
         case FOURCC_YUY2:
+        case FOURCC_UYVY:
             p_format->i_bits_per_pixel = 16;
             p_format->i_bits_per_pixel = 16;
             break;
@@ -659,6 +660,7 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
             p_pic->i_planes = 1;
             break;
 
+        case FOURCC_UYVY:
         case FOURCC_YUY2:
             p_pic->p->i_lines = i_height;
             p_pic->p->i_pitch = i_width * 2;