Commit 0382ac45 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Fix snapshot height integer overflow creating mini-snapshots

See http://forum.videolan.org/viewtopic.php?f=2&t=81103
http://forum.videolan.org/viewtopic.php?f=14&t=80008
http://forum.videolan.org/viewtopic.php?f=13&t=73500
(cherry picked from commit 2aef1c084bef4e127c7c15f6c75707b3b68fa4f4)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 6ce175cf
...@@ -907,13 +907,13 @@ int picture_Export( vlc_object_t *p_obj, ...@@ -907,13 +907,13 @@ int picture_Export( vlc_object_t *p_obj,
unsigned int i_original_height; unsigned int i_original_height;
if( fmt_in.i_sar_num >= fmt_in.i_sar_den ) if( fmt_in.i_sar_num >= fmt_in.i_sar_den )
{ {
i_original_width = fmt_in.i_width * fmt_in.i_sar_num / fmt_in.i_sar_den; i_original_width = (int64_t)fmt_in.i_width * fmt_in.i_sar_num / fmt_in.i_sar_den;
i_original_height = fmt_in.i_height; i_original_height = fmt_in.i_height;
} }
else else
{ {
i_original_width = fmt_in.i_width; i_original_width = fmt_in.i_width;
i_original_height = fmt_in.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num; i_original_height = (int64_t)fmt_in.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num;
} }
/* */ /* */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment