diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:42:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:49:27 +0200 |
| commit | cce254373c41b0b6c92cf71ad3099327a9f7b523 (patch) | |
| tree | 7a3e32241639eee3cf20fc044b151ceb6e6caeac /libavcodec/sanm.c | |
| parent | 107a56c1ed8c95ea668a073fb865c4dac19ffd38 (diff) | |
| parent | 3802833bc1f79775a1547c5e427fed6e92b77e53 (diff) | |
| download | ffmpeg-cce254373c41b0b6c92cf71ad3099327a9f7b523.tar.gz | |
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>
Diffstat (limited to 'libavcodec/sanm.c')
0 files changed, 0 insertions, 0 deletions