[FFmpeg-cvslog] Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'

[Hendrik Leppkes]

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

Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'

* commit '3973f0f773e0bd212734eccda78aa798f8b20692':
  Revert "avconv_opt: Allow printing private options"

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

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