[FFmpeg-cvslog] 4xm: remove unneeded check for remaining unused data.

Justin Ruggles git at videolan.org
Mon Dec 19 03:18:29 CET 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sun Dec 18 13:21:27 2011 -0500| [bc78ceec2be6613c265387017221c7ceda15aa7d] | committer: Justin Ruggles

4xm: remove unneeded check for remaining unused data.

This is unnecessary complication that only prints a message and does not
affect decoding.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc78ceec2be6613c265387017221c7ceda15aa7d
---

 libavcodec/4xm.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 21bde52..0ae10d5 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;
 }
 



More information about the ffmpeg-cvslog mailing list