Mercurial > libavcodec.hg
comparison faxcompr.c @ 10315:27cb9c2c0c6b libavcodec
Simplify r20025: use align_get_bits instead of reimplementing it.
author | reimar |
---|---|
date | Tue, 29 Sep 2009 11:06:04 +0000 |
parents | 943b63f364ca |
children | 7dd2a45249a9 |
comparison
equal
deleted
inserted
replaced
10314:ab687351bfef | 10315:27cb9c2c0c6b |
---|---|
300 break; | 300 break; |
301 if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb)) | 301 if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb)) |
302 ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend); | 302 ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend); |
303 else | 303 else |
304 ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref); | 304 ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref); |
305 if(compr==TIFF_CCITT_RLE && (get_bits_count(&gb) & 7)) | 305 if(compr==TIFF_CCITT_RLE) |
306 skip_bits(&gb, 8 - (get_bits_count(&gb) & 7)); | 306 align_get_bits(&gb); |
307 } | 307 } |
308 if(ret < 0){ | 308 if(ret < 0){ |
309 put_line(dst, stride, avctx->width, ref); | 309 put_line(dst, stride, avctx->width, ref); |
310 }else{ | 310 }else{ |
311 put_line(dst, stride, avctx->width, runs); | 311 put_line(dst, stride, avctx->width, runs); |