Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 08:34:05 +0000 (10:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 08:34:05 +0000 (10:34 +0200)
commitc7b0a84e1fe1ba4415d5d578ddb9532d379201cf
treeb727284ea95b2c33c99eec287a636fb8aa16aa5e
parent31428240ec1ee163424822bb0a1042bd70182da2
parent62549f9655c48f0ec061087fa33a96040ce01145
Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'

* commit '62549f9655c48f0ec061087fa33a96040ce01145':
  lavfi: error out when options are provided to a filter that does not take any

Conflicts:
libavfilter/avfilter.c

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