[FFmpeg-cvslog] Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep 29 15:30:48 2015 +0200| [7255cf003ef17c5223d6748f25be592ba30933f0] | committer: Hendrik Leppkes

Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'

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

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

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