[FFmpeg-cvslog] Merge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:39:47 2015 +0100| [c7831e55b517b44c58e64dddfdde3e542873abfd] | committer: Michael Niedermayer

Merge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4

* commit '242fc6394fecb403bcbd0f652920f2647d0b08ae':
  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=c7831e55b517b44c58e64dddfdde3e542873abfd
---