Merge commit '09a098fb8bc7d70a0258b3e8d658833c8d11debe' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Sep 2013 09:05:54 +0000 (11:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Sep 2013 09:06:02 +0000 (11:06 +0200)
* commit '09a098fb8bc7d70a0258b3e8d658833c8d11debe':
  atrac3: fix error handling
  qdm2: check and reset dithering index per channel

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

Simple merge
Simple merge