[SCM] libav/experimental: Simplify r20025: use align_get_bits instead of reimplementing it.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:52:09 UTC 2013
The following commit has been merged in the experimental branch:
commit badce93dad3585f2c3fafe9ea5a2f85810367db6
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Tue Sep 29 11:06:04 2009 +0000
Simplify r20025: use align_get_bits instead of reimplementing it.
Originally committed as revision 20079 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 9266e54..c5613e9 100644
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list