diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-12-26 15:05:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-12-26 15:05:12 +0000 |
| commit | 66909bc4f166d99db352a262191c8135ae15e127 (patch) | |
| tree | 348b417ca407f7055d5cfe755cb080c407d43da1 /libavcodec/faxcompr.h | |
| parent | d68542f019c89e7938297a18da282e3a892718aa (diff) | |
Merge ff_ccitt_unpack_1d and 2d.
Originally committed as revision 16332 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/faxcompr.h')
| -rw-r--r-- | libavcodec/faxcompr.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavcodec/faxcompr.h b/libavcodec/faxcompr.h index 51a3497cc9..632744be64 100644 --- a/libavcodec/faxcompr.h +++ b/libavcodec/faxcompr.h @@ -28,6 +28,7 @@ #define AVCODEC_FAXCOMPR_H #include "avcodec.h" +#include "tiff.h" /** * initialize upacker code @@ -35,17 +36,10 @@ void ff_ccitt_unpack_init(); /** - * 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, +int ff_ccitt_unpack(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); + uint8_t *dst, int height, int stride, enum TiffCompr compr); #endif /* AVCODEC_FAXCOMPR_H */ |