Changeset 11b51d62210fb0cd6f0c067eec6e40074e9c9c7d

Timestamp:

06/03/08 17:01:28 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1212505288 +0200

git-parent:

[86c91e1260731c8c3d708af0ed289b048d78bf98]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1212505263 +0200

Message:

Do not align height and width on multiples of 16 in XVideo output. This fixes #1604. If someone thinks that this fix isn't correct, please revert this commit ... and explain why it was wrong :)

Files:

• modules/video_output/x11/xcommon.c (modified) (4 diffs)

modules/video_output/x11/xcommon.c

@@ -1450 +1450 @@
-                                    p_win->i_width, p_win->i_height );
-                }
- 
+
-
-#if 0
@@ -2003 +2003 @@
-                    + p_pic->p_sys->p_image->offsets[1];
-            }
+
-            break;
-
@@ -2839 +2840 @@
-    /* Create XImage / XvImage */
-#ifdef MODULE_NAME_IS_xvideo
-
-    /* Make sure the buffer is aligned to multiple of 16 */
-    i_height = ( i_height + 15 ) >> 4 << 4;
-    i_width = ( i_width + 15 ) >> 4 << 4;
-
-    p_image = XvShmCreateImage( p_display, i_xvport, i_chroma, 0,
-                                i_width, i_height, p_shm );
@@ -2929 +2925 @@
-    /* Allocate memory for image */
-#ifdef MODULE_NAME_IS_xvideo
-
-    /* Make sure the buffer is aligned to multiple of 16 */
-    i_height = ( i_height + 15 ) >> 4 << 4;
-    i_width = ( i_width + 15 ) >> 4 << 4;
-
-    p_data = malloc( i_width * i_height * i_bits_per_pixel / 8 );
-#elif defined(MODULE_NAME_IS_x11)