Merge commit '145023f57262d21474e35b4a6069cf95136339d4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 11:07:01 +0000 (13:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 11:14:42 +0000 (13:14 +0200)
commitf13f4d2b086519c2b0692ae1ff12d81e8ec494f1
tree3102afd2f254843b7fbd6a3bfd2cb98ca771cf04
parent18cb3d355f13df255f0d438c06607b637842e8b5
parent145023f57262d21474e35b4a6069cf95136339d4
Merge commit '145023f57262d21474e35b4a6069cf95136339d4'

* commit '145023f57262d21474e35b4a6069cf95136339d4':
  4xm: reject frames not compatible with the declared version

See: c433823750bf096187e70c22822431a7c0bb4202

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