[FFmpeg-cvslog] Merge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  3 14:50:31 2013 +0200| [bdb4ed963f7ecf919075838a64904fd6e49d07ba] | committer: Michael Niedermayer

Merge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'

* commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf':
  4xm: check that bits per sample is strictly positive

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

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