* Fixed 4:2:2 software rendering.

  * Removed cruft I forgot in aout_alsa.c.

diff --git a/plugins/alsa/aout_alsa.c b/plugins/alsa/aout_alsa.c
index 74974319a8d48bb28a316b19ee753df6b894a07a..cbc3f5d5548affa35eb47a616e69225bcca0f583 100644 (file)
--- a/plugins/alsa/aout_alsa.c
+++ b/plugins/alsa/aout_alsa.c
@@ -2,7 +2,7 @@
  * aout_alsa.c : Alsa functions library
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: aout_alsa.c,v 1.22 2001/12/07 18:33:07 sam Exp $
+ * $Id: aout_alsa.c,v 1.22.2.1 2001/12/17 01:36:59 sam Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org> - Original Author
  *          Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
@@ -86,11 +86,9 @@ static int aout_Probe( probedata_t *p_data )
     int i_open_return, i_close_return;
     aout_sys_t local_sys;
 
-    printf("aout_probe\n");
     /* Open device */
     i_open_return = snd_pcm_open( &(local_sys.p_alsa_handle), "default",
                                   SND_PCM_STREAM_PLAYBACK, 0 );
-    printf("grmbl\n");
     if( i_open_return )
     {
         intf_WarnMsg( 2, "aout info: could not probe ALSA device (%s)",

diff --git a/plugins/yuv/transforms_common.h b/plugins/yuv/transforms_common.h
index 2d542707ec9791517edf056994b549264a85bf93..a126de891eecc7c56df8a2ce048cc1e9b6d0f99b 100644 (file)
--- a/plugins/yuv/transforms_common.h
+++ b/plugins/yuv/transforms_common.h
@@ -2,7 +2,7 @@
  * transforms_common.h: YUV transformation macros for truecolor
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: transforms_common.h,v 1.3 2001/10/11 13:19:27 massiot Exp $
+ * $Id: transforms_common.h,v 1.3.2.1 2001/12/17 01:36:59 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -121,7 +121,12 @@
                     p_v += i_chroma_width;                                    \
                 }                                                             \
             }                                                                 \
-            else if( (CHROMA == 422) || (CHROMA == 444) )                     \
+            else if( CHROMA == 422 )                                          \
+            {                                                                 \
+                p_u += i_chroma_width;                                        \
+                p_v += i_chroma_width;                                        \
+            }                                                                 \
+            else if( CHROMA == 444 )                                          \
             {                                                                 \
                 p_u += i_width;                                               \
                 p_v += i_width;                                               \