diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 20:29:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 20:40:37 +0200 |
| commit | 85f115b5d8d7d8f39d9a2934242b108f5b7c891e (patch) | |
| tree | 4502b80cfcce9c082b5091a67022766222511f57 /libavformat/riff.c | |
| parent | da3f89988f03ffb399879c5ffabed8b4111e548a (diff) | |
| parent | c334c113d4d9e9a41bc38a3e4458d7ab21010401 (diff) | |
| download | ffmpeg-85f115b5d8d7d8f39d9a2934242b108f5b7c891e.tar.gz | |
Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'
* commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401':
vf_scale: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_scale.c
scale keeps using our shorthand system due to the alternative not
supporting the more complex syntactical things like 1 parameter
dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
0 files changed, 0 insertions, 0 deletions