Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 09:56:31 +0000 (11:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 09:56:31 +0000 (11:56 +0200)
commit4027e136635759999ffb5fa16d1053f26c1dec5e
tree697896a1a82cd5ac499a505e8579e7fcb8e672bd
parent60657ee37afb5388b75430db95cbce5146731c63
parent42d73f7f6bea0ee0f64a3ad4882860ce5b923a11
Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'

* commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11':
  4xm: do not overread while parsing header

Conflicts:
libavformat/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/4xm.c