Merge commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 31 Aug 2015 08:00:07 +0000 (10:00 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 31 Aug 2015 08:00:07 +0000 (10:00 +0200)
commitad79fa471b6fc9b5d39d0ce4b5bb28cb616940bc
tree0903418663ae6bb7a0d28476fbdc145a211a9253
parent1acd6311a100859f3ef4119790da9d5cb5546979
parent629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3
Merge commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3'

* commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3':
  avconv_opt: Add missing comma

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>