[FFmpeg-cvslog] Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  3 01:18:54 2015 +0100| [7ca10d10aae32fa42b6afc486328a7ec017bd457] | committer: Michael Niedermayer

Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'

* commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e':
  movenc: Factorize writing ftyp and other identification tags to a separate function

Conflicts:
	libavformat/movenc.c

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

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