diff options
| author | Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> | 2007-04-06 20:49:26 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-04-06 20:49:26 +0000 |
| commit | e780e99e5a9f842fcaaffd2d800d1e966d87440b (patch) | |
| tree | 63b11f96912cac4e41de5a0fdce326c875288f29 | |
| parent | 90b4e3930f992b71b6463c5ebe6f2dc7556e7323 (diff) | |
| download | ffmpeg-e780e99e5a9f842fcaaffd2d800d1e966d87440b.tar.gz | |
s/invert/photometric_interpretation/ patch by Kamil Nowosad k.nowosad students mimuw edu pl
Originally committed as revision 8637 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/tiffenc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 1df715824e..c5db0e9de2 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -49,7 +49,7 @@ typedef struct TiffEncoderContext { unsigned int bpp; ///< bits per pixel int compr; ///< compression level int bpp_tab_size; ///< bpp_tab size - int invert; ///< photometric interpretation + int photometric_interpretation; ///< photometric interpretation int strips; ///< number of strips int rps; ///< row per strip uint8_t entries[TIFF_MAX_ENTRY*12]; ///< entires in header @@ -214,23 +214,23 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf, switch (avctx->pix_fmt) { case PIX_FMT_RGB24: s->bpp = 24; - s->invert = 2; + s->photometric_interpretation = 2; break; case PIX_FMT_GRAY8: s->bpp = 8; - s->invert = 1; + s->photometric_interpretation = 1; break; case PIX_FMT_PAL8: s->bpp = 8; - s->invert = 3; + s->photometric_interpretation = 3; break; case PIX_FMT_MONOBLACK: s->bpp = 1; - s->invert = 1; + s->photometric_interpretation = 1; break; case PIX_FMT_MONOWHITE: s->bpp = 1; - s->invert = 0; + s->photometric_interpretation = 0; break; default: av_log(s->avctx, AV_LOG_ERROR, @@ -312,7 +312,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf, add_entry(s, TIFF_BPP, TIFF_SHORT, s->bpp_tab_size, bpp_tab); add_entry1(s,TIFF_COMPR, TIFF_SHORT, s->compr); - add_entry1(s,TIFF_INVERT, TIFF_SHORT, s->invert); + add_entry1(s,TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation); add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, strip_offsets); if (s->bpp_tab_size) |