SOURCES: vlc-pic-mmx.patch, vlc-gcc-hack.patch (REMOVED) - fixed p...

[glen]

Author: glen                         Date: Wed Dec 13 08:53:24 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed properly

---- Files affected:
SOURCES:
   vlc-pic-mmx.patch (1.1 -> 1.2) , vlc-gcc-hack.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/vlc-pic-mmx.patch
diff -u SOURCES/vlc-pic-mmx.patch:1.1 SOURCES/vlc-pic-mmx.patch:1.2
--- SOURCES/vlc-pic-mmx.patch:1.1	Fri Sep 16 12:11:33 2005
+++ SOURCES/vlc-pic-mmx.patch	Wed Dec 13 09:53:19 2006
@@ -1,16 +1,19 @@
-diff -ur -x '*~' vlc-0.8.2/modules/video_chroma/i420_rgb16.c vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c
---- vlc-0.8.2/modules/video_chroma/i420_rgb16.c	2005-06-25 15:43:10.000000000 +0200
-+++ vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c	2005-07-10 23:59:57.656177984 +0200
-@@ -31,7 +31,7 @@
+--- vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c	2005-07-10 23:59:57.656177984 +0200
++++ vlc-0.8.6/modules/video_chroma/i420_rgb16.c	2006-12-13 10:51:50.256615375 +0200
+@@ -31,9 +31,10 @@
  #include <vlc/vout.h>
  
  #include "i420_rgb.h"
 -#if defined (MODULE_NAME_IS_i420_rgb)
 +#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
  #   include "i420_rgb_c.h"
- #elif defined (MODULE_NAME_IS_i420_rgb_mmx)
- #   include "i420_rgb_mmx.h"
-@@ -216,7 +216,7 @@
+-#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
++#endif
++#if defined (MODULE_NAME_IS_i420_rgb_mmx)
+ #   if defined(HAVE_MMX_INTRINSICS)
+ #       include <mmintrin.h>
+ #   endif
+@@ -216,7 +217,7 @@
      int         i_scale_count;                       /* scale modulo counter */
      int         i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
      uint16_t *  p_pic_start;       /* beginning of the current line for copy */
@@ -19,7 +22,7 @@
      int         i_uval, i_vval;                           /* U and V samples */
      int         i_red, i_green, i_blue;          /* U and V modified samples */
      uint16_t *  p_yuv = p_vout->chroma.p_sys->p_rgb16;
-@@ -264,7 +264,7 @@
+@@ -264,7 +265,7 @@
          p_pic_start = p_pic;
          p_buffer = b_hscale ? p_buffer_start : p_pic;
  
@@ -28,7 +31,7 @@
          for ( i_x = p_vout->render.i_width / 8; i_x--; )
          {
              CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
-@@ -323,7 +323,7 @@
+@@ -323,7 +324,7 @@
              p_u -= i_rewind >> 1;
              p_v -= i_rewind >> 1;
              p_buffer -= i_rewind;
@@ -37,7 +40,7 @@
              CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
              CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
              CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
-@@ -397,7 +397,7 @@
+@@ -397,7 +398,7 @@
      int         i_scale_count;                       /* scale modulo counter */
      int         i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
      uint32_t *  p_pic_start;       /* beginning of the current line for copy */
@@ -46,7 +49,7 @@
      int         i_uval, i_vval;                           /* U and V samples */
      int         i_red, i_green, i_blue;          /* U and V modified samples */
      uint32_t *  p_yuv = p_vout->chroma.p_sys->p_rgb32;
-@@ -447,7 +447,7 @@
+@@ -447,7 +448,7 @@
  
          for ( i_x = p_vout->render.i_width / 8; i_x--; )
          {
@@ -55,7 +58,7 @@
              CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
              CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
              CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
-@@ -477,7 +477,7 @@
+@@ -477,7 +478,7 @@
              p_u -= i_rewind >> 1;
              p_v -= i_rewind >> 1;
              p_buffer -= i_rewind;
@@ -64,7 +67,6 @@
              CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
              CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
              CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
-diff -ur -x '*~' vlc-0.8.2/modules/video_chroma/i420_rgb.h vlc-0.8.2-pic/modules/video_chroma/i420_rgb.h
 --- vlc-0.8.2/modules/video_chroma/i420_rgb.h	2005-06-25 15:43:10.000000000 +0200
 +++ vlc-0.8.2-pic/modules/video_chroma/i420_rgb.h	2005-07-10 23:57:30.248587344 +0200
 @@ -35,7 +35,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/vlc-pic-mmx.patch?r1=1.1&r2=1.2&f=u