diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-17 14:30:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-17 14:30:33 +0100 |
| commit | 975fbd43addbf70c047167b761ddcf06e8083c14 (patch) | |
| tree | 9f33eb323cea5b961dc96f8b71d8d26483eec635 /ffmpeg_opt.c | |
| parent | fa7031ad37526bc9916e87dda25547ebbb6f4a3b (diff) | |
| parent | 7e6c67dd24d767bfa71ec9cfefca5833535aaa84 (diff) | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/buffersink: fix header.
lavfi/buffersrc: disable deprecated warnings.
lavfi/buffersrc: check channel count changes.
lavfi/buffersrc: set channel layout if it is known.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions