diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 12:18:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 12:18:58 +0100 |
| commit | 4d60e5051e66c6e79645efec1376b98caf41ad03 (patch) | |
| tree | cd3cac5dce89799a1f1f0254ba33f73ff35167d0 /libavfilter/vsrc_mandelbrot.c | |
| parent | 8c0a14d221af1add009829d65a5beb0e5d5d8770 (diff) | |
| parent | faf340f60c18c0af282570eed156ec67c1d98f6f (diff) | |
| download | ffmpeg-4d60e5051e66c6e79645efec1376b98caf41ad03.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
binkaudio: set channel layout
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsrc_mandelbrot.c')
0 files changed, 0 insertions, 0 deletions