summaryrefslogtreecommitdiff
path: root/libavcodec/faxcompr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-30 22:16:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-30 22:24:58 +0200
commit438b86fed47d766b5af30cd1c379d15aa4cf4e57 (patch)
tree94aa441cfafe29f8c60e3a96829a25b63e5815fb /libavcodec/faxcompr.c
parentcb6defb05339f472d7d720f6eb3143ba3c24d303 (diff)
downloadffmpeg-438b86fed47d766b5af30cd1c379d15aa4cf4e57.tar.gz
faxcompr: fix byte alignment case
Fixes Ticket1653 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/faxcompr.c')
-rw-r--r--libavcodec/faxcompr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 57e92bee42..5aa7885679 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){