[FFmpeg-cvslog] Merge commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 29 21:25:51 2014 +0100| [9a534eda4608b76fa0c958e876025b2c639aeb63] | committer: Michael Niedermayer

Merge commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42'

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

Conflicts:
	libavformat/mtv.c

See: 8b9b6332dfeb169098c8ab1351d66fc5b474dd55
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a534eda4608b76fa0c958e876025b2c639aeb63
---