Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'

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

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

ffmpeg_opt.c

@@ -2823,6 +2823,7 @@ void show_help_default(const char *opt, const char *arg)
            "    -h      -- print basic options\n"
            "    -h long -- print more options\n"
            "    -h full -- print all options (including all format and codec specific options, very long)\n"
+           "    -h type=name -- print all options for the named decoder/encoder/demuxer/muxer/filter\n"
            "    See man %s for detailed description of the options.\n"
            "\n", program_name);