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)
* commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba':
  movenc: Set tfhd default sample flags based on actual samples, if possible

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

Simple merge
index e74b8f2,0000000..a44065c
mode 100644,000000..100644
--- /dev/null
@@@ -1,1 -1,0 +1,1 @@@
- bb762c178bd8c437a9101c748c1ccb4d
++930cfa0d91434f46a8a197a2165a734a