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)
* qatar/master:
  qdm2: check and reset dithering index per channel

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

Simple merge