xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_video.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0f575984594e6977b4a7cb794dad8c6e56c850f1
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Oct 19 19:21:39 2010 -0400

    Xv: limit overlay to 2047x2047
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=15391

diff --git a/src/radeon_video.c b/src/radeon_video.c
index f28e7af..0bb5ab3 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -325,7 +325,7 @@ static XF86VideoEncodingRec DummyEncoding =
 {
    0,
    "XV_IMAGE",
-   2048, 2048,
+   2047, 2047,
    {1, 1}
 };
 
@@ -334,7 +334,7 @@ static XF86VideoEncodingRec DummyEncoding =
 static XF86VideoEncodingRec
 InputVideoEncodings[] =
 {
-    { 0, "XV_IMAGE",			2048,2048,{1,1}},        
+    { 0, "XV_IMAGE",			2047,2047,{1,1}},        
     { 1, "pal-composite",		720, 288, { 1, 50 }},
     { 2, "pal-tuner",			720, 288, { 1, 50 }},
     { 3, "pal-svideo",			720, 288, { 1, 50 }},
@@ -1515,8 +1515,8 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
 	RADEONVIP_init(pScrn, pPriv);
 
     info->adaptor = adapt;
-    info->xv_max_width = 2048;
-    info->xv_max_height = 2048;
+    info->xv_max_width = 2047;
+    info->xv_max_height = 2047;
 
 	if(!xf86LoadSubModule(pScrn,"theatre_detect")) 
 	{
@@ -3380,8 +3380,8 @@ RADEONInitOffscreenImages(ScreenPtr pScreen)
     offscreenImages[0].stop = RADEONStopSurface;
     offscreenImages[0].setAttribute = RADEONSetSurfaceAttribute;
     offscreenImages[0].getAttribute = RADEONGetSurfaceAttribute;
-    offscreenImages[0].max_width = 2048;
-    offscreenImages[0].max_height = 2048;
+    offscreenImages[0].max_width = 2047;
+    offscreenImages[0].max_height = 2047;
     offscreenImages[0].num_attributes = NUM_ATTRIBUTES;
     offscreenImages[0].attributes = Attributes;