Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 17:02:13 +0000 (19:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 17:03:30 +0000 (19:03 +0200)
commitb8a1f8b4e28b4ff85aae8fdedf586d60f0514118
tree89fc3770280b24c4da5575b28716e8402e0a4bcc
parent0c3d706bdb2276d39cb4e07784ce58664dbc5485
parenta39c154049a2d0c4fb02a5c74f58d6986ec21cec
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>
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_fieldorder.c