]> git.sesse.net Git - ffmpeg/commit
Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:07:28 +0000 (22:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:11:08 +0000 (22:11 +0100)
commit2f41b186963d6ad8c653133ad2ab7d36960cfcbc
tree4c82c24414643233f0d6a1a12cb9d194c6011d6d
parent8a5397d88b8cebd82962cca5ed8688f0ce056f18
parenteeae858596a5ce5a84797283f590a16add5704f4
Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'

* commit 'eeae858596a5ce5a84797283f590a16add5704f4':
  isom: Support Sony XAVC in mov

See: 5b9f39860d83380c4af3039710b4fcf3ea1f4c99
See: 6e65e3483706d969d176909fae9e216919f59277
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/isom.c