Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:29:46 +0000 (15:29 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:29:46 +0000 (15:29 +0200)
commite490fee6b971f53061d0d21ba0dd79e8a30c7f34
treec33236f808ae50bbe3893f646777f8d4870f9a20
parent773570a9dce94922471530d29585e5e87ff64f7a
parent3973f0f773e0bd212734eccda78aa798f8b20692
Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'

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

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