diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:02:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:03:30 +0200 |
| commit | b8a1f8b4e28b4ff85aae8fdedf586d60f0514118 (patch) | |
| tree | 89fc3770280b24c4da5575b28716e8402e0a4bcc /libavformat/voc.h | |
| parent | 0c3d706bdb2276d39cb4e07784ce58664dbc5485 (diff) | |
| parent | a39c154049a2d0c4fb02a5c74f58d6986ec21cec (diff) | |
| download | ffmpeg-b8a1f8b4e28b4ff85aae8fdedf586d60f0514118.tar.gz | |
Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'
* commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec':
vf_fieldorder: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_fieldorder.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/voc.h')
0 files changed, 0 insertions, 0 deletions