File xf86-video-intel-xvmc_i915_i945-1.diff of Package xorg-x11-driver-video

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-video-intel-xvmc_i915_i945-1.diff of Package xorg-x11-driver-video (Revision ca9035093195fe3d8b23629a75e6efb5)

Currently displaying revision ca9035093195fe3d8b23629a75e6efb5 , Show latest

diff-tree 105f8a183eb64623d9a9e2833dbe27156a551f69 (from 87cc72ef509b85635bf0e84c47dfed6b7242170b)
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date:   Fri Aug 10 16:44:46 2007 +0800

disable subpicture initial
    
    until we really implement it, OSD can't work for now.

diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index b6865c6..7a8a073 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -131,8 +131,10 @@ static XF86MCSurfaceInfoRec i915_YV12_mp
     720,
     576,
     XVMC_MPEG_2,
-    XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING,
-    &yv12_subpicture_list
+    /* XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING,*/
+    0,
+    /* &yv12_subpicture_list*/
+    NULL,
 };
 
 static XF86MCSurfaceInfoRec i915_YV12_mpg1_surface =
@@ -145,8 +147,10 @@ static XF86MCSurfaceInfoRec i915_YV12_mp
     720,
     576,
     XVMC_MPEG_1,
-    XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING,
-    &yv12_subpicture_list
+    /* XVMC_OVERLAID_SURFACE | XVMC_SUBPICTURE_INDEPENDENT_SCALING,*/
+    0,
+    /* &yv12_subpicture_list*/
+    NULL,
 };
 
 static XF86MCSurfaceInfoPtr ppSI[2] = 
@@ -177,8 +181,12 @@ static XF86MCAdaptorRec pAdapt = 
     "Intel(R) Textured Video",		                        /* name */
     ARRARY_SIZE(ppSI),                                          /* num_surfaces */
     ppSI,				                        /* surfaces */
+    0,
+    NULL,
+#if 0
     ARRARY_SIZE(i915_subpicture_list),                          /* num_subpictures */
     i915_subpicture_list,		                        /* subpictures */
+#endif
     (xf86XvMCCreateContextProcPtr)I915XvMCCreateContext,
     (xf86XvMCDestroyContextProcPtr)I915XvMCDestroyContext,
     (xf86XvMCCreateSurfaceProcPtr)I915XvMCCreateSurface,

Places

File xf86-video-intel-xvmc_i915_i945-1.diff of Package xorg-x11-driver-video (Revision ca9035093195fe3d8b23629a75e6efb5)

Places