Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'

* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c': isom: Add support for TSCC2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 2cfa1fdb08
parent 33a79e443b 96dd04427f
commit 2cfa1fdb08
1 changed files with 1 additions and 0 deletions
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@ -59,6 +59,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
    { 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 },