diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 16:23:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 16:23:29 +0200 |
| commit | ed1ad2f5ebe9ad4ee8700760e97d30ca5b75d9ec (patch) | |
| tree | 7a3a82e99298665531bde5af4ef94ac5812ce1a5 /tests/ref/vsynth/vsynth1-qtrlegray | |
| parent | c2eb668617555cb8b8bcfb9796241ada9471ac65 (diff) | |
| parent | b3d8276d2dc913d708d187fb15f6e98869d00500 (diff) | |
| download | ffmpeg-ed1ad2f5ebe9ad4ee8700760e97d30ca5b75d9ec.tar.gz | |
Merge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2
* commit 'b3d8276d2dc913d708d187fb15f6e98869d00500':
dcadec: Do not decode the XCh extension when downmixing to stereo
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth1-qtrlegray')
0 files changed, 0 insertions, 0 deletions