[FFmpeg-cvslog] faxcompr: fix byte alignment case

Michael Niedermayer git at videolan.org
Thu Aug 30 22:26:03 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 30 22:16:17 2012 +0200| [438b86fed47d766b5af30cd1c379d15aa4cf4e57] | committer: Michael Niedermayer

faxcompr: fix byte alignment case

Fixes Ticket1653

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/faxcompr.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 57e92be..5aa7885 100644
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -291,7 +291,8 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
     ref[1] = 0;
     ref[2] = 0;
     init_get_bits(&gb, src, srcsize*8);
-    has_eol = show_bits(&gb, 12) == 1;
+    has_eol = show_bits(&gb, 12) == 1 || show_bits(&gb, 16) == 1;
+
     for(j = 0; j < height; j++){
         runend = runs + runsize;
         if(compr == TIFF_G4){



More information about the ffmpeg-cvslog mailing list