* commit '9731cf40':
  movenc: Keep writing zero-entry stts atoms as intended

Conflicts:
	libavformat/movenc.c

See: 95165f7cMerged-by: Michael Niedermayer <michaelni@gmx.at>