Merge commit 'b64bd2e18bac1bd3e3e0ae4aebcad1c33f031c66' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 11:18:18 +0000 (13:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 11:18:27 +0000 (13:18 +0200)
commita88ed5a481c365b9ca95588aeee6d9858ad5df40
treeca46f1fab490703d6ffc7cdb68478e97b947fd90
parentf33d5af1f35e1f1fd83648d321b489c9006525c9
parentb64bd2e18bac1bd3e3e0ae4aebcad1c33f031c66
Merge commit 'b64bd2e18bac1bd3e3e0ae4aebcad1c33f031c66' into release/0.10

* commit 'b64bd2e18bac1bd3e3e0ae4aebcad1c33f031c66':
  qdm2: refactor joined stereo support
  adpcm: Write the correct number of samples for ima-dk4
  imc: Catch a division by zero
  atrac3: Error on impossible encoding/channel combinations

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