* commit '242fc639':
  mtv: improve header check and avoid division by zero

Conflicts:
	libavformat/mtv.c

See: 8b9b6332Merged-by: Michael Niedermayer <michaelni@gmx.at>