[FFmpeg-cvslog] Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 10 14:53:05 2013 +0200| [564909093a318a6520a7bac7353ddea325e9f6fb] | committer: Michael Niedermayer

Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'

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

Conflicts:
	libavcodec/qdm2.c

See: 2b12d1ffd841cf57976b124c1882e4a23a7c5f61

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=564909093a318a6520a7bac7353ddea325e9f6fb
---