Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:30:48 +0000 (15:30 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:30:48 +0000 (15:30 +0200)
commit7255cf003ef17c5223d6748f25be592ba30933f0
tree02e7f6a63fb8f6a9fbb1ef16f4bddca0a946821c
parente490fee6b971f53061d0d21ba0dd79e8a30c7f34
parentb5e4f393b6757629281f58c3f3f6d55ca522ab60
Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'

* commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60':
  avconv: Make the private options discovery more manifest

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