Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 22:30:13 +0000 (23:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 22:30:13 +0000 (23:30 +0100)
commitae65cc7ed3647a769ded853cc2771eda5c11b66e
treedc41420fb6364c62acd195e21d71a204c20d2738
parent730f3c49e0821cd156b0ff714a098d202c9673df
parent2cb9c2fc59c9267ad2631c07c81c188058502259
Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'

* commit '2cb9c2fc59c9267ad2631c07c81c188058502259':
  movenc: Allow interleaving samples when writing fragmented files

Conflicts:
libavformat/movenc.c
libavformat/movenc.h

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