* commit 'f9072969':
  mov: Do not group tracks if more than one is enabled per type

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