Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 11:52:53 +0000 (13:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 11:59:45 +0000 (13:59 +0200)
commit2a2a643c90ff091f1fa4a0634bcc4e18639bcee0
tree2f093ba8b00873b35ed154df0da9251bb6dbacc6
parent451315830a3b8ff4014cd0dda8583f5845e5a8d0
parente67a87eac814c7805d18c983c43033a8a1bd62af
Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'

* commit 'e67a87eac814c7805d18c983c43033a8a1bd62af':
  vf_(no)format: switch to an AVOptions-based system.
  af_aformat: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/af_aformat.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/af_aformat.c
libavfilter/avfilter.c
libavfilter/vf_format.c