--- XFree86.CLEAN/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c	Thu Sep 27 01:25:04 2001
+++ XFree86.MERGE/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c	Thu Oct 25 14:14:19 2001
@@ -93,7 +93,7 @@
   yv12_subpicture_index_list
 };
  
-static XF86MCSurfaceInfoRec i810_YV12_surface =
+static XF86MCSurfaceInfoRec i810_YV12_mpg2_surface =
 {
     FOURCC_YV12,  
     XVMC_CHROMA_FORMAT_420,
@@ -102,14 +102,31 @@
     576,
     720,
     576,
-    XVMC_MPEG_2 | XVMC_MPEG_1,
-    XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING,
+    XVMC_MPEG_2,
+    XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING |
+    XVMC_INTRA_UNSIGNED,
     &yv12_subpicture_list
 };
 
-static XF86MCSurfaceInfoPtr ppSI[1] = 
+static XF86MCSurfaceInfoRec i810_YV12_mpg1_surface =
 {
-    (XF86MCSurfaceInfoPtr)&i810_YV12_surface
+    FOURCC_YV12,  
+    XVMC_CHROMA_FORMAT_420,
+    0,
+    720,
+    576,
+    720,
+    576,
+    XVMC_MPEG_1,
+    XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING |
+    XVMC_INTRA_UNSIGNED,
+    &yv12_subpicture_list
+};
+
+static XF86MCSurfaceInfoPtr ppSI[2] = 
+{
+    (XF86MCSurfaceInfoPtr)&i810_YV12_mpg2_surface,
+    (XF86MCSurfaceInfoPtr)&i810_YV12_mpg1_surface
 };
 
 /* List of subpicture types that we support */