Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 10:24:58 +0000 (12:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 10:28:07 +0000 (12:28 +0200)
commita3d9a21683557d1e6c4c4018eb7979a9504fff0d
tree1dd810e48ad639145362750caabb68f8012ab09a
parent40e8967ee161a9d247419e77da745e939f0ddaf8
parentbbf6a4aa20bfe3d7869b2218e66063602dfb8aa7
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@gmx.at>
libavcodec/atrac3.c