* commit '29d61d73':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
	libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>