diff options
| author | Michael Niedermayer <[email protected]> | 2013-04-11 01:14:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-04-11 01:18:18 +0200 |
| commit | ab6091f8e21df7280f2b50fd6226bbc130fb060a (patch) | |
| tree | c4fbd5b558abb6993e5aeb9b6dd3eeca095c86f7 /libavutil/samplefmt.c | |
| parent | 8ac7090c233c0677e59ee5cf7a5817e02c9ec914 (diff) | |
| parent | 7536c671040f1f3ebc9f0d3b7831dac71436b775 (diff) | |
Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'
* commit '7536c671040f1f3ebc9f0d3b7831dac71436b775':
vf_yadif: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_yadif.c
libavfilter/yadif.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/samplefmt.c')
0 files changed, 0 insertions, 0 deletions