[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 11 01:21:06 2013 +0100| [43f925536844c6a7f24f104a4cc540d860c88ae0] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  alsdec: check block length

See: 0ceca269b66ec12a23bf0907bd2c220513cdbf16
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43f925536844c6a7f24f104a4cc540d860c88ae0
---