Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 01:20:43 +0000 (03:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 01:20:43 +0000 (03:20 +0200)
commit670e0f7f66207227d70898b07fe0eace767cd027
tree27079411eb3b76266d52dd126ec1ec3d189b3ff2
parent8bafd83aaafad42e64acfe3646e5b4b3597982fd
parentb7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e
Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'

* commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e':
  vsrc_nullsrc: switch to an AVOptions-based system.

Conflicts:
libavfilter/vsrc_nullsrc.c

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