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)
commit2cfa1fdb08a9fa5f88bc829b24ac865488cdb60f
tree82b8d03ae29f2c0875aa697f92867bd6d061000c
parent33a79e443b8611c8df4752373bc3322e85a03b1f
parent96dd04427fc46e5e25a5ac1f00753207e3aedb0c
Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'

* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c':
  isom: Add support for TSCC2

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