[FFmpeg-cvslog] Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 10 12:24:58 2013 +0200| [a3d9a21683557d1e6c4c4018eb7979a9504fff0d] | committer: Michael Niedermayer

Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'

* commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7':
  imc: Catch a division by zero
  atrac3: Error on impossible encoding/channel combinations

See: 13451f5520ce6b0afde861b2285dda659f8d4fb4

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

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