From: Justin Ruggles Date: Sun, 18 Dec 2011 18:21:27 +0000 (-0500) Subject: 4xm: remove unneeded check for remaining unused data. X-Git-Tag: v0.8b1~132 X-Git-Url: https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=bc78ceec2be6613c265387017221c7ceda15aa7d;ds=sidebyside 4xm: remove unneeded check for remaining unused data. This is unnecessary complication that only prints a message and does not affect decoding. --- diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 21bde52fee..0ae10d5905 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -415,15 +415,6 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){ dst += 8*stride; } - if( bitstream_size != (get_bits_count(&f->gb)+31)/32*4 - || (((const char*)f->wordstream - (const char*)buf + 2)&~2) != extra + bitstream_size + wordstream_size - || (((const char*)f->bytestream - (const char*)buf + 3)&~3) != extra + bitstream_size + wordstream_size + bytestream_size) - av_log(f->avctx, AV_LOG_ERROR, " %d %td %td bytes left\n", - bitstream_size - (get_bits_count(&f->gb)+31)/32*4, - -(((const char*)f->bytestream - (const char*)buf + 3)&~3) + (extra + bitstream_size + wordstream_size + bytestream_size), - -(((const char*)f->wordstream - (const char*)buf + 2)&~2) + (extra + bitstream_size + wordstream_size) - ); - return 0; }