summaryrefslogtreecommitdiff
path: root/src/i915_hwmc.c
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyu.z.wang@intel.com>2007-08-10 16:44:46 +0800
committerZhenyu Wang <zhenyu.z.wang@intel.com>2007-08-10 16:44:46 +0800
commit105f8a183eb64623d9a9e2833dbe27156a551f69 (patch)
treebf5496cdeb7469f373f2d500639abf98b716604a /src/i915_hwmc.c
parent87cc72ef509b85635bf0e84c47dfed6b7242170b (diff)
disable subpicture initial
until we really implement it, OSD can't work for now.
Diffstat (limited to 'src/i915_hwmc.c')
-rw-r--r--src/i915_hwmc.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index b6865c6f..7a8a0730 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -131,8 +131,10 @@ static XF86MCSurfaceInfoRec i915_YV12_mpg2_surface =
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_mpg1_surface =
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,