diff options
author | Christian König <[email protected]> | 2012-03-08 11:25:14 +0100 |
---|---|---|
committer | Christian König <[email protected]> | 2012-03-09 12:44:51 +0100 |
commit | 85dbb227964d5533a497dbda4803fdf43ad9567f (patch) | |
tree | 96b0a47d1859c5ce3c0fc4eb4cec5706569a2a01 /src | |
parent | 9a3c2776acef1950a752e109eedd282a40edaf66 (diff) |
vl/mpeg12: make bitstream decoder more robust
Just another xine workaround.
Signed-off-by: Christian König <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_vlc.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c index f0ad2e49a3b..23580463df9 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c @@ -825,6 +825,8 @@ decode_slice(struct vl_mpg12_bs *bs, struct pipe_video_buffer *target) } inc += vl_vlc_get_vlclbf(&bs->vlc, tbl_B1, 11); if (x != -1) { + if (!inc) + return; mb.num_skipped_macroblocks = inc - 1; bs->decoder->decode_macroblock(bs->decoder, target, &bs->desc->base, &mb.base, 1); } diff --git a/src/gallium/auxiliary/vl/vl_vlc.h b/src/gallium/auxiliary/vl/vl_vlc.h index baaa48a0fef..6223fabf577 100644 --- a/src/gallium/auxiliary/vl/vl_vlc.h +++ b/src/gallium/auxiliary/vl/vl_vlc.h @@ -271,7 +271,6 @@ vl_vlc_get_vlclbf(struct vl_vlc *vlc, const struct vl_vlc_entry *tbl, unsigned n { tbl += vl_vlc_peekbits(vlc, num_bits); vl_vlc_eatbits(vlc, tbl->length); - assert(tbl->length); return tbl->value; } |