Merge commit '46d4d8575979a24a8d026d9805039b724e0e3e5f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 10:21:50 +0000 (11:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 10:27:29 +0000 (11:27 +0100)
* commit '46d4d8575979a24a8d026d9805039b724e0e3e5f':
  movenc: Avoid writing separate flags for the first sample if not necessary

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

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