[FFmpeg-cvslog] Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  3 03:13:16 2015 +0100| [f38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8] | committer: Michael Niedermayer

Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'

* commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b':
  movenc: Add an option for delaying writing the moov with empty_moov

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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