Remove unnecessary header inclusion directives.

[ffmpeg] / libavcodec / faxcompr.c

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 087197e97c71871ba9391b9941f5467aee882b51..c5613e9f4657ceecb057df64a018a4f5acafa3d5 100644 (file)
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -25,7 +25,8 @@
  * @author Konstantin Shishkov
  */
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
+#include "put_bits.h"
 #include "faxcompr.h"
 
 #define CCITT_SYMS 104
@@ -252,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)
@@ -267,8 +269,9 @@ static int find_group3_syncmarker(GetBitContext *gb, int srcsize)
 }
 
 int ff_ccitt_unpack(AVCodecContext *avctx,
-                       const uint8_t *src, int srcsize,
-                       uint8_t *dst, int height, int stride, enum TiffCompr compr)
+                    const uint8_t *src, int srcsize,
+                    uint8_t *dst, int height, int stride,
+                    enum TiffCompr compr, int opts)
 {
     int j;
     GetBitContext gb;
@@ -292,12 +295,15 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
                 return -1;
             }
         }else{
-            if(find_group3_syncmarker(&gb, srcsize*8) < 0)
+            int g3d1 = (compr == TIFF_G3) && !(opts & 1);
+            if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0)
                 break;
-            if(compr==TIFF_CCITT_RLE || get_bits1(&gb))
+            if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
                 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)
+                align_get_bits(&gb);
         }
         if(ret < 0){
             put_line(dst, stride, avctx->width, ref);