From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 12 Jul 2013 12:42:00 +0000 (+0200)
Subject: Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'
X-Git-Tag: android-x86-4.4-r1~2386
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cce254373c41b0b6c92cf71ad3099327a9f7b523;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'

* commit '3802833bc1f79775a1547c5e427fed6e92b77e53':
  dca: Respect the current limits in the downmixing capabilities

Conflicts:
	libavcodec/dcadec.c

See: 8e77c3846e91b1af9df4084736257d9899156eef

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

cce254373c41b0b6c92cf71ad3099327a9f7b523