TechSmith Screen Codec 2 decoder

Changelog

@@ -32,6 +32,7 @@ version <next>:
 - audio channel mapping filter
 - Microsoft ATC Screen decoder
 - RTSP listen mode
+- TechSmith Screen Codec 2 decoder
 
 
 version 0.8:

doc/general.texi

@@ -603,6 +603,8 @@ following image formats are supported:
     @tab fourcc: SP5X
 @item TechSmith Screen Capture Codec  @tab     @tab  X
     @tab fourcc: TSCC
+@item TechSmith Screen Capture Codec 2  @tab     @tab  X
+    @tab fourcc: TSC2
 @item Theora                 @tab  E  @tab  X
     @tab encoding supported through external library libtheora
 @item Tiertex Limited SEQ video  @tab     @tab  X

libavcodec/Makefile

@@ -400,6 +400,7 @@ OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.o
 OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.o
 OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.o
 OBJS-$(CONFIG_TSCC_DECODER)            += tscc.o msrledec.o
+OBJS-$(CONFIG_TSCC2_DECODER)           += tscc2.o
 OBJS-$(CONFIG_TTA_DECODER)             += tta.o
 OBJS-$(CONFIG_TWINVQ_DECODER)          += twinvq.o celp_math.o
 OBJS-$(CONFIG_TXD_DECODER)             += txd.o s3tc.o

libavcodec/allcodecs.c

@@ -203,6 +203,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER (TRUEMOTION1, truemotion1);
     REGISTER_DECODER (TRUEMOTION2, truemotion2);
     REGISTER_DECODER (TSCC, tscc);
+    REGISTER_DECODER (TSCC2, tscc2);
     REGISTER_DECODER (TXD, txd);
     REGISTER_DECODER (ULTI, ulti);
     REGISTER_DECODER (UTVIDEO, utvideo);

libavcodec/avcodec.h

@@ -257,6 +257,7 @@ enum CodecID {
     CODEC_ID_ZEROCODEC,
     CODEC_ID_MSS1,
     CODEC_ID_MSA1,
+    CODEC_ID_TSCC2,
 
     /* various PCM "codecs" */
     CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs

libavcodec/version.h

@@ -27,7 +27,7 @@
  */
 
 #define LIBAVCODEC_VERSION_MAJOR 54
-#define LIBAVCODEC_VERSION_MINOR 17
+#define LIBAVCODEC_VERSION_MINOR 18
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

libavformat/riff.c

@@ -286,6 +286,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { CODEC_ID_ZEROCODEC,    MKTAG('Z', 'E', 'C', 'O') },
     { CODEC_ID_MSS1,         MKTAG('M', 'S', 'S', '1') },
     { CODEC_ID_MSA1,         MKTAG('M', 'S', 'A', '1') },
+    { CODEC_ID_TSCC2,        MKTAG('T', 'S', 'C', '2') },
     { CODEC_ID_NONE,         0 }
 };