Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 19:05:33 +0000 (20:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 19:05:53 +0000 (20:05 +0100)
* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c':
  isom: Add support for TSCC2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/isom.c

@@@ -57,8 -57,8 +57,9 @@@ const AVCodecTag ff_mp4_obj_type[] = 
      { AV_CODEC_ID_VC1         , 0xA3 },
      { AV_CODEC_ID_DIRAC       , 0xA4 },
      { AV_CODEC_ID_AC3         , 0xA5 },
 +    { AV_CODEC_ID_EAC3        , 0xA6 },
      { AV_CODEC_ID_DTS         , 0xA9 }, /* mp4ra.org */
+     { AV_CODEC_ID_TSCC2       , 0xD0 }, /* non standard, camtasia uses it */
      { AV_CODEC_ID_VORBIS      , 0xDD }, /* non standard, gpac uses it */
      { AV_CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
      { AV_CODEC_ID_QCELP       , 0xE1 },