[FFmpeg-cvslog] Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 16 23:30:13 2015 +0100| [ae65cc7ed3647a769ded853cc2771eda5c11b66e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae65cc7ed3647a769ded853cc2771eda5c11b66e
---