diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:18:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:24:48 +0200 |
| commit | b3fb2d8cec91dadf935832f3bef97bf5a3a11352 (patch) | |
| tree | 5cd66817a72919b0dd0ceaa55713959ad7a7a259 /libswscale/input.c | |
| parent | 7e99ccf5d8c25d7fe670d9402349b055c0c1449a (diff) | |
| parent | 95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e (diff) | |
| download | ffmpeg-b3fb2d8cec91dadf935832f3bef97bf5a3a11352.tar.gz | |
Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'
* commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e':
vf_select: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_select.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/input.c')
0 files changed, 0 insertions, 0 deletions