summaryrefslogtreecommitdiffstats
path: root/libmpeg2
diff options
context:
space:
mode:
authoriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-21 16:03:55 +0000
committeriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-06-21 16:03:55 +0000
commit2576078e0885c1edf0dfbbcf53ede561ace1c6ad (patch)
treed4479784d9a375ba4b934d2f967596c095584f7f /libmpeg2
parent87db316b13c198ed1f93111d28b34530cd6e9c7b (diff)
downloadmpv-2576078e0885c1edf0dfbbcf53ede561ace1c6ad.tar.bz2
mpv-2576078e0885c1edf0dfbbcf53ede561ace1c6ad.tar.xz
width and height in seq_header could never be 0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12618 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
-rw-r--r--libmpeg2/header.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpeg2/header.c b/libmpeg2/header.c
index e8a39939e6..248b2e24e2 100644
--- a/libmpeg2/header.c
+++ b/libmpeg2/header.c
@@ -111,6 +111,10 @@ int mpeg2_header_sequence (mpeg2dec_t * mpeg2dec)
i = (buffer[0] << 16) | (buffer[1] << 8) | buffer[2];
sequence->display_width = sequence->picture_width = width = i >> 12;
sequence->display_height = sequence->picture_height = height = i & 0xfff;
+
+ if(width == 0 || height == 0)
+ return 1;
+
decoder->width = sequence->width = width = (width + 15) & ~15;
decoder->height = sequence->height = height = (height + 15) & ~15;
decoder->vertical_position_extension = (height > 2800);