diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:34:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:34:05 +0200 |
| commit | c7b0a84e1fe1ba4415d5d578ddb9532d379201cf (patch) | |
| tree | b727284ea95b2c33c99eec287a636fb8aa16aa5e /presets/libx264-ipod320.ffpreset | |
| parent | 31428240ec1ee163424822bb0a1042bd70182da2 (diff) | |
| parent | 62549f9655c48f0ec061087fa33a96040ce01145 (diff) | |
| download | ffmpeg-c7b0a84e1fe1ba4415d5d578ddb9532d379201cf.tar.gz | |
Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'
* commit '62549f9655c48f0ec061087fa33a96040ce01145':
lavfi: error out when options are provided to a filter that does not take any
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libx264-ipod320.ffpreset')
0 files changed, 0 insertions, 0 deletions