Merge commit '73d5d405d424c06f3f354337cfdb24794932094d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 00:49:13 +0000 (02:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 00:50:21 +0000 (02:50 +0200)
commit7f2198a2f1cf24c8df6709058f9e6f3d69c44f7a
tree21e37dc9c4d1225b3f006982e274019d9b5d41c7
parentae6634da8b81021c15db3048c185a874b2b96505
parent73d5d405d424c06f3f354337cfdb24794932094d
Merge commit '73d5d405d424c06f3f354337cfdb24794932094d'

* commit '73d5d405d424c06f3f354337cfdb24794932094d':
  split: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfilter.c
libavfilter/split.c