summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12.c
diff options
context:
space:
mode:
authorDaniel Kristjansson <danielk@mrl.nyu.edu>2010-06-30 21:46:03 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-06-30 21:46:03 +0000
commit0db2d3cf1d8b6483160707e1ee0f0574b13c30c6 (patch)
tree314e5b397d30bb0610db57fa4553d0808c4a682a /libavcodec/mpeg12.c
parent809b7a99b27548fdb12709b69dc7cacff0a20f01 (diff)
Do not skip one of three bits zero padding.
Patch by Daniel Kristjansson, danielk cuymedia net Originally committed as revision 23914 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r--libavcodec/mpeg12.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 24beae3a13..9f2d23d2be 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1440,7 +1440,7 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
w= get_bits(&s->gb, 14);
skip_bits(&s->gb, 1); //marker
h= get_bits(&s->gb, 14);
- skip_bits(&s->gb, 1); //marker
+ // remaining 3 bits are zero padding
s1->pan_scan.width= 16*w;
s1->pan_scan.height=16*h;