Merge commit '064f19f3'

* commit '064f19f3':
  avconv: support parsing bitstream filter options

This commit is a noop, see 5ef19590Merged-by: NJames Almer <jamrial@gmail.com>