TIFF decoder

Originally committed as revision 6682 to svn://svn.ffmpeg.org/ffmpeg/trunk

Changelog

@@ -63,6 +63,7 @@ version <next>
 - Delphine Software .cin demuxer/audio and video decoder
 - Tiertex .seq demuxer/video decoder
 - MTV demuxer
+- TIFF picture decoder
 
 version 0.4.9-pre1:
 

MAINTAINERS

@@ -156,6 +156,7 @@ Codecs:
   sonic.c                               Alex Beregszaszi
   svq3.c                                Michael Niedermayer
   targa.c                               Kostya Shishkov
+  tiff.c                                Kostya Shishkov
   truemotion1*                          Mike Melanson
   truemotion2*                          Kostya Shishkov
   truespeech.c                          Kostya Shishkov

doc/ffmpeg-doc.texi

@@ -761,6 +761,7 @@ following image formats are supported:
 @item animated GIF @tab X @tab X @tab Only uncompressed GIFs are generated.
 @item PNG          @tab X @tab X @tab 2 bit and 4 bit/pixel not supported yet.
 @item Targa        @tab   @tab X @tab Targa (.TGA) image format.
+@item TIFF         @tab   @tab X @tab Only 24 bit/pixel images are supported.
 @item SGI          @tab X @tab X @tab SGI RGB image format
 @end multitable
 

libavcodec/Makefile

@@ -134,6 +134,7 @@ OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1.o
 OBJS-$(CONFIG_SVQ3_DECODER)            += h264.o
 OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
 OBJS-$(CONFIG_THEORA_DECODER)          += vp3.o
+OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o
 OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.o
 OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.o
 OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.o

libavcodec/allcodecs.c

@@ -557,6 +557,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_TIERTEXSEQVIDEO_DECODER
     register_avcodec(&tiertexseqvideo_decoder);
 #endif //CONFIG_TIERTEXSEQVIDEO_DECODER
+#ifdef CONFIG_TIFF_DECODER
+    register_avcodec(&tiff_decoder);
+#endif //CONFIG_TIFF_DECODER
 
 #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
 #ifdef CONFIG_AMR_NB_DECODER

libavcodec/avcodec.h

@@ -37,8 +37,8 @@ extern "C" {
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT  ((51<<16)+(19<<8)+0)
-#define LIBAVCODEC_VERSION      51.19.0
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(20<<8)+0)
+#define LIBAVCODEC_VERSION      51.20.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -147,6 +147,7 @@ enum CodecID {
     CODEC_ID_TARGA,
     CODEC_ID_DSICINVIDEO,
     CODEC_ID_TIERTEXSEQVIDEO,
+    CODEC_ID_TIFF,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,
@@ -2300,6 +2301,7 @@ extern AVCodec targa_decoder;
 extern AVCodec dsicinvideo_decoder;
 extern AVCodec dsicinaudio_decoder;
 extern AVCodec tiertexseqvideo_decoder;
+extern AVCodec tiff_decoder;
 
 /* pcm codecs */
 #define PCM_CODEC(id, name) \

libavformat/mov.c

@@ -118,6 +118,7 @@ static const CodecTag mov_video_tags[] = {
     { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */
     //{ CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
     { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, /* Truevision Targa */
+    { CODEC_ID_TIFF, MKTAG('t', 'i', 'f', 'f') }, /* TIFF embedded in MOV */
     { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */
     { CODEC_ID_NONE, 0 },
 };