Merge commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:20:33 +0000 (22:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:21:12 +0000 (22:21 +0100)
commit76367f453f6f7cb340c4798a2b059b81abc60c71
treecabb58f365838f07074aa48a8290b706232aacc1
parentd32245e5b12cd3c8aa8740585db950bfa628e69d
parent073cd30fb4dc1c2a885c62540e3cfaac1f17c21b
Merge commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b'

* commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b':
  isom: Support MPEG-2 video mov files from FPC5

See: 0aded6bf028ff188e3bbd7eb023bd854b474b794
Merged-by: Michael Niedermayer <michaelni@gmx.at>