summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Bachelot <xavier@bachelot.org>2010-05-04 21:57:20 +0000
committerXavier Bachelot <xavier@bachelot.org>2010-05-04 21:57:20 +0000
commitbf741a136d8c483532e34e5404d47d3e335ae577 (patch)
treea4362af18561cf9280438e6667f9458ebf1a4d31
parent2306148da2b0636725b2882f35b2c8c5b80d03fb (diff)
Revert 2 changes that should not have gone into rev 846
-rw-r--r--src/via_swov.c3
-rw-r--r--src/via_video.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/via_swov.c b/src/via_swov.c
index 2ed5c42..2dc1b0e 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1280,10 +1280,9 @@ ViaSwovSurfaceCreate(ScrnInfoPtr pScrn, viaPortPrivPtr pPriv,
break;
case FOURCC_YV12:
- case FOURCC_I420:
retCode = CreateSurface(pScrn, FourCC, Width, Height, TRUE);
if (retCode == Success)
- retCode = AddHQVSurface(pScrn, numbuf, FourCC);
+ retCode = AddHQVSurface(pScrn, numbuf, FOURCC_YV12);
break;
case FOURCC_XVMC:
diff --git a/src/via_video.c b/src/via_video.c
index e9d79a8..11c981b 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -1448,7 +1448,6 @@ viaQueryImageAttributes(ScrnInfoPtr pScrn,
switch (id) {
case FOURCC_YV12: /*Planar format : YV12 -4:2:0 */
- case FOURCC_I420:
*h = (*h + 1) & ~1;
size = *w;
if (pVia->useDmaBlit)