diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:51:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:51:02 +0200 |
| commit | da3f89988f03ffb399879c5ffabed8b4111e548a (patch) | |
| tree | ea2cf3158c038b3f92073b0ec2dbb31b1798bd33 /libavformat/riff.h | |
| parent | 9280fc7da1fcb09f6466a925e0d4f95618ea9db3 (diff) | |
| parent | 5aa1a668cfae7f617e1a06efad20f87283badd8a (diff) | |
| download | ffmpeg-da3f89988f03ffb399879c5ffabed8b4111e548a.tar.gz | |
Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'
* commit '5aa1a668cfae7f617e1a06efad20f87283badd8a':
vf_frei0r: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.h')
0 files changed, 0 insertions, 0 deletions