diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 14:32:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 14:32:47 +0100 |
| commit | 267c5723e08e04346e447b1e58cf81c80b13f799 (patch) | |
| tree | e0b6ac732fc9e84beeae5bd22583bbe9e9bb1c82 /ffmpeg_opt.c | |
| parent | c198af648a2ab800abe9259f420a4b38059c3f18 (diff) | |
| parent | a84c8af042f3b42f23cdcc51c34155647270d689 (diff) | |
| download | ffmpeg-267c5723e08e04346e447b1e58cf81c80b13f799.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a test for the ONE_STR mapping mode of the channelmap filter
Conflicts:
tests/fate/filter-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions