[vlc-commits] Ensure that picture_Setup() use at least a mod 32 height for pictures.

[Laurent Aimar]

vlc/vlc-1.2 | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Dec 12 20:24:32 2011 +0100| [f93e69864a568e4f5bf30bae7799901b47e938e5] | committer: Jean-Baptiste Kempf

Ensure that picture_Setup() use at least a mod 32 height for pictures.
(cherry picked from commit bc3b85c6bd6dc0094562561b084dcea3f0364743)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=f93e69864a568e4f5bf30bae7799901b47e938e5
---

 src/misc/picture.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/misc/picture.c b/src/misc/picture.c
index bf65fc5..cb106a7 100644
--- a/src/misc/picture.c
+++ b/src/misc/picture.c
@@ -167,6 +167,7 @@ int picture_Setup( picture_t *p_picture, vlc_fourcc_t i_chroma,
         if( i_ratio_h < p_dsc->p[i].h.den )
             i_ratio_h = p_dsc->p[i].h.den;
     }
+    i_modulo_h = LCM( i_modulo_h, 32 );
 
     const int i_width_aligned  = ( i_width  + i_modulo_w - 1 ) / i_modulo_w * i_modulo_w;
     const int i_height_aligned = ( i_height + i_modulo_h - 1 ) / i_modulo_h * i_modulo_h;