* commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3': avconv_opt: Add missing comma Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>