diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:58:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:58:29 +0100 |
| commit | 845fa2f5c9643a2f80b29614351609f1f1d3994d (patch) | |
| tree | 7a3b1136b62cfaeb8889e1709a225c52ab207edb /libavfilter/vf_mp.c | |
| parent | 91043de8256fa87a0a20cc3a139f668110257dbe (diff) | |
| parent | 157542ebc15dd175e5b4d14ffa92afd74ab4a991 (diff) | |
| download | ffmpeg-845fa2f5c9643a2f80b29614351609f1f1d3994d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: fix mixing matrix reduction when normalization is disabled
lavr: fix matrix reduction for upmixing in certain cases
lavr: cosmetics: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_mp.c')
0 files changed, 0 insertions, 0 deletions