Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'

* commit '943533d64c7fa7a1b2fc9559e67652c349d21d51':
  avconv: Correct function pointer assignments in options array

This commit is a noop, see 4c96985af1

Merged-by: Clément Bœsch <u@pkh.me>
pull/258/head
Clément Bœsch 8 years ago
commit aac40dd615

Diff Content Not Available