Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 12:53:05 +0000 (14:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 13:07:20 +0000 (15:07 +0200)
commit564909093a318a6520a7bac7353ddea325e9f6fb
tree025f724dfd05662fd9cade83d5bd7cbe87c3bc74
parent2c0ec526e2c3cf24766910486c710bf600ef2f44
parentadadc3f2443d25b375e21e801516ccfd78e0b080
Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'

* commit 'adadc3f2443d25b375e21e801516ccfd78e0b080':
  qdm2: refactor joined stereo support

Conflicts:
libavcodec/qdm2.c

See: 2b12d1ffd841cf57976b124c1882e4a23a7c5f61

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