IBM Ultimotion video decoder, courtesy of Konstantin Shishkov

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

Changelog

 version <next>
 - TechSmith Camtasia (TSCC) video decoder
+- IBM Ultimotion (ULTI) video decoder
 
 version 0.4.9-pre1:
 

doc/ffmpeg-doc.texi

@@ -754,6 +754,7 @@ following image formats are supported:
 @item MSZH                   @tab     @tab  X @tab Part of LCL
 @item ZLIB                   @tab  X  @tab  X @tab Part of LCL, encoder experimental
 @item TechSmith Camtasia     @tab     @tab  X @tab fourcc: TSCC
+@item IBM Ultimotion         @tab     @tab  X @tab fourcc: ULTI
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.

libavcodec/Makefile

@@ -20,7 +20,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \
       roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
       msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
       smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
-      flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o
+      flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o
 
 ifeq ($(AMR_NB),yes)
 ifeq ($(AMR_NB_FIXED),yes)

libavcodec/allcodecs.c

@@ -106,6 +106,8 @@ void avcodec_register_all(void)
     register_avcodec(&wmav1_decoder);
     register_avcodec(&wmav2_decoder);
     register_avcodec(&indeo3_decoder);
+    register_avcodec(&tscc_decoder);
+    register_avcodec(&ulti_decoder);
 #ifdef CONFIG_FAAD
     register_avcodec(&aac_decoder);
     register_avcodec(&mpeg4aac_decoder);
@@ -169,7 +171,6 @@ void avcodec_register_all(void)
     register_avcodec(&xan_dpcm_decoder);
     register_avcodec(&qtrle_decoder);
     register_avcodec(&flac_decoder);
-    register_avcodec(&tscc_decoder);
 #endif /* CONFIG_DECODERS */
 
 #ifdef AMR_NB

libavcodec/avcodec.h

@@ -102,6 +102,7 @@ enum CodecID {
     CODEC_ID_QTRLE,
     CODEC_ID_SNOW,
     CODEC_ID_TSCC,
+    CODEC_ID_ULTI,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE,
@@ -1855,6 +1856,7 @@ extern AVCodec sonic_decoder;
 extern AVCodec qtrle_decoder;
 extern AVCodec flac_decoder;
 extern AVCodec tscc_decoder;
+extern AVCodec ulti_decoder;
 
 /* pcm codecs */
 #define PCM_CODEC(id, name) \

libavformat/avienc.c

@@ -167,6 +167,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
     { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },
     { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') },
+    { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') },
     { CODEC_ID_RAWVIDEO, 0 },
     { 0, 0 },
 };