Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 11:07:26 +0000 (13:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 11:07:26 +0000 (13:07 +0200)
commit375d7ee8056ad087f16ba7320a9b3dca8aa86512
treebc1693ee314ffa9d55ce349ba4c56930dda1d5c9
parent4c91599484e115e9b51c884fc46cea3f8511f8ae
parentdf2aa22203afc9377832bdf800df5dbd3aa9687e
Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'

* commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e':
  mov: Clarify tkhd flag settings

Conflicts:
libavformat/movenc.c

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