fixed UNPACK_ALIGNMENT setting.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13576 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 15 insertions, 3 deletions

diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index c675f9167d..7aee1be15c 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -248,6 +248,17 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
 
   glEnable(GL_TEXTURE_2D);
 
+  // set alignment as default is 4 which will break some files
+  if ((image_width * image_bytes) % 8 == 0)
+    gl_alignment=8;
+  else if ((image_width * image_bytes) % 4 == 0)
+    gl_alignment=4;
+  else if ((image_width * image_bytes) % 2 == 0)
+    gl_alignment=2;
+  else
+    gl_alignment=1;
+  glPixelStorei (GL_UNPACK_ALIGNMENT, gl_alignment);
+
   mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",texture_width,texture_height);
 
 #if 1
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index b05d00b1d4..60d15bcbca 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -819,12 +819,13 @@ static int initGl(uint32_t d_width, uint32_t d_height)
 
   /**
    * may give a little speed up for a kinda burst read ..
+   * Also, the default of 4 will break some files.
    */
-  if( (image_width*image_bpp)%8 == 0 )
+  if( (image_width*image_bytes)%8 == 0 )
   	gl_alignment=8;
-  else if( (image_width*image_bpp)%4 == 0 )
+  else if( (image_width*image_bytes)%4 == 0 )
   	gl_alignment=4;
-  else if( (image_width*image_bpp)%2 == 0 )
+  else if( (image_width*image_bytes)%2 == 0 )
   	gl_alignment=2;
   else
   	gl_alignment=1;