* commit 'df2aa222':
  mov: Clarify tkhd flag settings

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