Merge branch 'master' of git+ssh://git.freedesktop.org/git/pixman into yuv-porting

Conflicts:

	pixman/pixman-compose.c
	pixman/pixman.h

diff --cc pixman/pixman-compose.c
index 8dd0714,4c73822..ef49850
--- 1/pixman/pixman-compose.c
--- 2/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@@ -4189,10 -4093,10 +4189,10 @@@ static void fbFetchExternalAlpha(bits_i
  static void fbStore(bits_image_t * pict, int x, int y, int width, uint32_t *buffer)
  {
      uint32_t *bits;
-     int stride;
+     int32_t stride;
      storeProc store = storeProcForPicture(pict);
      const pixman_indexed_t * indexed = pict->indexed;
 -    
 +
      bits = pict->bits;
      stride = pict->rowstride;
      bits += y*stride;
@@@ -4259,9 -4163,9 +4259,9 @@@ PIXMAN_COMPOSITE_RECT_GENERAL (const Fb
      unsigned int srcClass = SOURCE_IMAGE_CLASS_UNKNOWN;
      unsigned int maskClass = SOURCE_IMAGE_CLASS_UNKNOWN;
      uint32_t *bits;
-     int stride;
+     int32_t stride;
      int xoff, yoff;
 -    
 +
      if (data->op == PIXMAN_OP_CLEAR)
          fetchSrc = NULL;
      else if (IS_SOURCE_IMAGE (data->src))

diff --cc pixman/pixman-mmx.c
Simple merge

diff --cc pixman/pixman.h
index 3b9601c,7b93214..604e4a8
--- 1/pixman/pixman.h
--- 2/pixman/pixman.h
+++ b/pixman/pixman.h
@@@ -454,11 -452,7 +454,11 @@@ typedef enum 
  /* 1bpp formats */
      PIXMAN_a1 =               PIXMAN_FORMAT(1,PIXMAN_TYPE_A,1,0,0,0),
      
 -    PIXMAN_g1 =               PIXMAN_FORMAT(1,PIXMAN_TYPE_GRAY,0,0,0,0)
 +    PIXMAN_g1 =               PIXMAN_FORMAT(1,PIXMAN_TYPE_GRAY,0,0,0,0),
 +
 +/* YUV formats */
 +    PIXMAN_yuy2 =     PIXMAN_FORMAT(16,PIXMAN_TYPE_YUY2,0,0,0,0),
-     PIXMAN_yv12 =     PIXMAN_FORMAT(12,PIXMAN_TYPE_YV12,0,0,0,0),
++    PIXMAN_yv12 =     PIXMAN_FORMAT(12,PIXMAN_TYPE_YV12,0,0,0,0)
  } pixman_format_code_t;
  
  /* Constructors */