Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:42:00 +0000 (14:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:49:27 +0000 (14:49 +0200)
* commit '3802833bc1f79775a1547c5e427fed6e92b77e53':
  dca: Respect the current limits in the downmixing capabilities

Conflicts:
libavcodec/dcadec.c

See: 8e77c3846e91b1af9df4084736257d9899156eef

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

Simple merge