Merge commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 20:25:51 +0000 (21:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 20:27:33 +0000 (21:27 +0100)
commit9a534eda4608b76fa0c958e876025b2c639aeb63
treecec9c653268a64a539d3827c88c216914a6d6ef6
parente08ff208c7934754e408f3985a68833f8c4b69c3
parentf64d7e919eabd427f3e6dd4a1219e448c78deb42
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@gmx.at>
libavformat/mtv.c