X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ffaxcompr.c;h=e59dad676abf7e132623a0a155792ded103d03a6;hb=53107041907f482ee941122d3bbe44683b74cb23;hp=9266e54919bb76f343d8d3200a2866dc150e6b52;hpb=a5568f460826b7ce068e81b2d51f35c5052287ed;p=ffmpeg diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index 9266e54919b..e59dad676ab 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -2,26 +2,26 @@ * CCITT Fax Group 3 and 4 decompression * Copyright (c) 2008 Konstantin Shishkov * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** + * @file * CCITT Fax Group 3 and 4 decompression - * @file libavcodec/faxcompr.c * @author Konstantin Shishkov */ #include "avcodec.h" @@ -302,8 +302,8 @@ int ff_ccitt_unpack(AVCodecContext *avctx, ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend); else ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref); - if(compr==TIFF_CCITT_RLE && (get_bits_count(&gb) & 7)) - skip_bits(&gb, 8 - (get_bits_count(&gb) & 7)); + if(compr==TIFF_CCITT_RLE) + align_get_bits(&gb); } if(ret < 0){ put_line(dst, stride, avctx->width, ref);