diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 18:23:49 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 18:23:49 +0400 |
| commit | e5294f407a81c2088ce21b5ae35469aff38ce100 (patch) | |
| tree | 5f346cc800122f9dacf05bc668b8bcb62b2fa009 /presets | |
| parent | ed1ad2f5ebe9ad4ee8700760e97d30ca5b75d9ec (diff) | |
| parent | 194d12345d86c15b20b7e44a3679c9df3075d7f6 (diff) | |
Merge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2
* commit '194d12345d86c15b20b7e44a3679c9df3075d7f6':
dcadec: Use correct channel count in stereo downmix check
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions