Merge commit '064f19f39e2f17927278c6ad8fe884a5b92310d6'

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

This commit is a noop, see 5ef1959080

Merged-by: James Almer <jamrial@gmail.com>
pull/131/merge
James Almer 8 years ago
commit 47c2ce2f75

Diff Content Not Available