Merge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:46:34 +0000 (11:46 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:46:34 +0000 (11:46 +0200)
commite34939ca762bc6dfbaa4dab7b90c93f715f2b8ac
tree783153081d78f62c67ccbe51376150c0c77563e5
parent7c46f24bde12d13e3214852b87f8bb2a8bbf0ac8
parent7bb1c1bfd22de2200743af04ebd0c7c775f56f7e
Merge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e'

* commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e':
  avconv_opt: Allow printing private options

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