diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:39:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 04:39:52 +0100 |
| commit | 5b3c68414749e87ef46a7ce19ce75be8c6f3d515 (patch) | |
| tree | 063b686e0d40f1e36ed77986f0e85d3cb1b70ed1 /tests/ref/vsynth2 | |
| parent | 3f41e57fa869036e42bf26dfaccf0c7b28d0bd19 (diff) | |
| parent | 3c8507a845e68b2c0c7fb53ef4c6972db80acf21 (diff) | |
| download | ffmpeg-5b3c68414749e87ef46a7ce19ce75be8c6f3d515.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dcadec: add disable_xch private option.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth2')
0 files changed, 0 insertions, 0 deletions