Merge commit 'de2e5777e225e75813daf2373c95e223651fd89a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 11:41:27 +0000 (13:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 11:41:27 +0000 (13:41 +0200)
commitdbddd587e13b9bf718ee0eb0d183be6d8ffb996f
treea8e2f612fb31b20604f9fce298d1c8479a120a98
parentf13f4d2b086519c2b0692ae1ff12d81e8ec494f1
parentde2e5777e225e75813daf2373c95e223651fd89a
Merge commit 'de2e5777e225e75813daf2373c95e223651fd89a'

* commit 'de2e5777e225e75813daf2373c95e223651fd89a':
  4xm: validate the buffer size before parsing it

Conflicts:
libavcodec/4xm.c

See: 9c661e95

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