Merge commit 'be373cb50d3c411366fec7eef2eb3681abe48f96'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 11:56:14 +0000 (13:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 11:57:07 +0000 (13:57 +0200)
commit67d5d97cdcd7ada748320edf34453d94668a67c6
treeda43716d756a1c8f08632a376c4da26ce5a9db8d
parentdbddd587e13b9bf718ee0eb0d183be6d8ffb996f
parentbe373cb50d3c411366fec7eef2eb3681abe48f96
Merge commit 'be373cb50d3c411366fec7eef2eb3681abe48f96'

* commit 'be373cb50d3c411366fec7eef2eb3681abe48f96':
  4xm: do not overread the prestream buffer

Conflicts:
libavcodec/4xm.c

See: 9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/4xm.c