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)
* commit '20f95f21f9b9595608ba668a6eca78f2d508be67':
  mov: Support default-base-is-moof.

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

Simple merge
Simple merge