Merge commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 10:08:33 +0000 (11:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 10:15:12 +0000 (11:15 +0100)
commite8821e74bb95e85e234f9118e14d2951456b5c32
tree6a86d5368ce413c43b176c0ea57f014c654bb46f
parent6453fddb58a0728156876e4119e69241d9a8cc6f
parent00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba
Merge commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba'

* commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba':
  movenc: Set tfhd default sample flags based on actual samples, if possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
tests/ref/fate/sub-movtextenc