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)
commite27bc85b31eec26f6dca2536d8057f6f9ebaac41
tree57427a4fd6fd6af355990092e35650d2e121019f
parent3f4fb49d1b14a849cbf5ebcd00bb0dba665b72a8
parent09a098fb8bc7d70a0258b3e8d658833c8d11debe
Merge commit '09a098fb8bc7d70a0258b3e8d658833c8d11debe' into release/0.10

* commit '09a098fb8bc7d70a0258b3e8d658833c8d11debe':
  atrac3: fix error handling
  qdm2: check and reset dithering index per channel

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