/**
* CCITT Fax Group 3 and 4 decompression
- * @file faxcompr.h
+ * @file libavcodec/faxcompr.h
* @author Konstantin Shishkov
*/
#ifndef AVCODEC_FAXCOMPR_H
#define AVCODEC_FAXCOMPR_H
#include "avcodec.h"
+#include "tiff.h"
/**
* initialize upacker code
*/
-void ff_ccitt_unpack_init();
+void ff_ccitt_unpack_init(void);
/**
- * unpack data compressed with CCITT Group 3 1-D method
+ * unpack data compressed with CCITT Group 3 1/2-D or Group 4 method
*/
-int ff_ccitt_unpack_1d(AVCodecContext *avctx,
- const uint8_t *src, int srcsize,
- uint8_t *dst, int height, int stride);
-
-/**
- * unpack data compressed with CCITT Group 3 2-D or Group 4 method
- */
-int ff_ccitt_unpack_2d(AVCodecContext *avctx,
- const uint8_t *src, int srcsize,
- uint8_t *dst, int height, int stride, int g4);
+int ff_ccitt_unpack(AVCodecContext *avctx,
+ const uint8_t *src, int srcsize,
+ uint8_t *dst, int height, int stride,
+ enum TiffCompr compr, int opts);
#endif /* AVCODEC_FAXCOMPR_H */