Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 17:51:02 +0000 (19:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 17:51:02 +0000 (19:51 +0200)
commitda3f89988f03ffb399879c5ffabed8b4111e548a
treeea2cf3158c038b3f92073b0ec2dbb31b1798bd33
parent9280fc7da1fcb09f6466a925e0d4f95618ea9db3
parent5aa1a668cfae7f617e1a06efad20f87283badd8a
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>
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_frei0r.c