Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 03:15:10 +0000 (05:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 03:26:17 +0000 (05:26 +0200)
commit44d0e520f85ac5087e53b99fc844fd9acaeb5fcf
treeb29ee1ffe119bff282ce0693ee54094d173ccc67
parente1f98f22313bfde3c85ac566902adeb118ec6d18
parent744a11c996641888d477a3981d609e79eeb69ea9
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: check and reset dithering index per channel

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