[FFmpeg-cvslog] Merge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 23 04:05:56 2014 +0100| [efe259a27e56ae2f68b924a7d24b08b69b3badc8] | committer: Michael Niedermayer

Merge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2

* commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85':
  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=efe259a27e56ae2f68b924a7d24b08b69b3badc8
---