[FFmpeg-cvslog] Merge commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Aug 31 10:00:07 2015 +0200| [ad79fa471b6fc9b5d39d0ce4b5bb28cb616940bc] | committer: Hendrik Leppkes

Merge commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad79fa471b6fc9b5d39d0ce4b5bb28cb616940bc
---