Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 12:51:59 +0000 (14:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 12:51:59 +0000 (14:51 +0200)
commita9821bdafb3a8dc1f390b79c84f86fb94a46043b
treedb21f714af58f57bf8319a8b6e85242115f37f5d
parente9f2e9715b2bf7e379174b4ca3d23b11526561c0
parent59d7bb99b6a963b7e11c637228b2203adf535eee
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  4xm: check bitstream_size boundary before using it

Conflicts:
libavcodec/4xm.c

See: 9c661e95

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