Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 14:31:54 +0000 (16:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 14:31:57 +0000 (16:31 +0200)
commitfb318def5d3a65efcc6c1f54dabbc06c4959dbcc
tree7e45caeac327d50d1013a2a9761cffb9ad821412
parent8d0c7031a846fe27c2a44831e743ee722174fdc0
parent20f95f21f9b9595608ba668a6eca78f2d508be67
Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'

* commit '20f95f21f9b9595608ba668a6eca78f2d508be67':
  mov: Support default-base-is-moof.

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