diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 21:25:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 21:27:33 +0100 |
commit | 9a534eda4608b76fa0c958e876025b2c639aeb63 (patch) | |
tree | cec9c653268a64a539d3827c88c216914a6d6ef6 /libavcodec/wmv2.h | |
parent | e08ff208c7934754e408f3985a68833f8c4b69c3 (diff) | |
parent | f64d7e919eabd427f3e6dd4a1219e448c78deb42 (diff) | |
download | ffmpeg-9a534eda4608b76fa0c958e876025b2c639aeb63.tar.gz |
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>
Diffstat (limited to 'libavcodec/wmv2.h')
0 files changed, 0 insertions, 0 deletions