diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:05:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:05:53 +0100 |
| commit | 2cfa1fdb08a9fa5f88bc829b24ac865488cdb60f (patch) | |
| tree | 82b8d03ae29f2c0875aa697f92867bd6d061000c /libavformat/isom.c | |
| parent | 33a79e443b8611c8df4752373bc3322e85a03b1f (diff) | |
| parent | 96dd04427fc46e5e25a5ac1f00753207e3aedb0c (diff) | |
| download | ffmpeg-2cfa1fdb08a9fa5f88bc829b24ac865488cdb60f.tar.gz | |
Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'
* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c':
isom: Add support for TSCC2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index fcd696a8b1..73a221e58c 100644 --- 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 }, |