[FFmpeg-cvslog] Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 23 03:22:20 2014 +0100| [802e5fc8f811fb0e1f23d3e12841d3134d67202e] | committer: Michael Niedermayer

Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'

* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
	libavformat/movenc.c

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

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