Properly initialize x264_picture_t in libx264.

[ffmpeg] / libavcodec / faxcompr.c

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 3b7d8e61c7450bcb499e57ed4b780c578f852f05..34aa57666013206799bba13946c3cab47010344d 100644 (file)
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -21,7 +21,7 @@
 
 /**
  * CCITT Fax Group 3 and 4 decompression
- * @file libavcodec/faxcompr.c
+ * @file
  * @author Konstantin Shishkov
  */
 #include "avcodec.h"
@@ -253,6 +253,7 @@ static void put_line(uint8_t *dst, int size, int width, const int *runs)
         if(run)
             put_sbits(&pb, run, mode);
     }
+    flush_put_bits(&pb);
 }
 
 static int find_group3_syncmarker(GetBitContext *gb, int srcsize)
@@ -301,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);