Mercurial > libavcodec.hg
comparison mpeg12.c @ 12028:2caea98f5711 libavcodec
Do not skip one of three bits zero padding.
Patch by Daniel Kristjansson, danielk cuymedia net
author | cehoyos |
---|---|
date | Wed, 30 Jun 2010 21:46:03 +0000 |
parents | fdafbcef52f5 |
children | c35d7bc64882 |
comparison
equal
deleted
inserted
replaced
12027:0bf266c3cd37 | 12028:2caea98f5711 |
---|---|
1438 s->avctx->colorspace = get_bits(&s->gb, 8); | 1438 s->avctx->colorspace = get_bits(&s->gb, 8); |
1439 } | 1439 } |
1440 w= get_bits(&s->gb, 14); | 1440 w= get_bits(&s->gb, 14); |
1441 skip_bits(&s->gb, 1); //marker | 1441 skip_bits(&s->gb, 1); //marker |
1442 h= get_bits(&s->gb, 14); | 1442 h= get_bits(&s->gb, 14); |
1443 skip_bits(&s->gb, 1); //marker | 1443 // remaining 3 bits are zero padding |
1444 | 1444 |
1445 s1->pan_scan.width= 16*w; | 1445 s1->pan_scan.width= 16*w; |
1446 s1->pan_scan.height=16*h; | 1446 s1->pan_scan.height=16*h; |
1447 | 1447 |
1448 if(s->avctx->debug & FF_DEBUG_PICT_INFO) | 1448 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |