diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
commit | de2cfb744a207cc09bc961c859d7ae91cb6192b4 (patch) | |
tree | 0a78680e2bcacd76b6b16b2d39005f74aa76ae05 /ffprobe.c | |
parent | 847943bc51098dbd68301099ed132cdde0f9eabf (diff) | |
parent | 7d7b40f48a05af4483b31cdb8b4f1808b97b1f2f (diff) | |
download | ffmpeg-streaming-de2cfb744a207cc09bc961c859d7ae91cb6192b4.zip ffmpeg-streaming-de2cfb744a207cc09bc961c859d7ae91cb6192b4.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcmenc: set correct bitrate value
avprobe: don't print format entry name when only one was requested
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
-rw-r--r-- | ffprobe.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -51,6 +51,7 @@ static int do_show_error = 0; static int do_show_format = 0; static int do_show_frames = 0; static AVDictionary *fmt_entries_to_show = NULL; +static int nb_fmt_entries_to_show; static int do_show_packets = 0; static int do_show_streams = 0; static int do_show_program_version = 0; @@ -398,6 +399,9 @@ static av_cold int default_init(WriterContext *wctx, const char *args, void *opa def->class = &default_class; av_opt_set_defaults(def); + if (nb_fmt_entries_to_show == 1) + def->nokey = 1; + if (args && (err = (av_set_options_string(def, args, "=", ":"))) < 0) { av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args); @@ -1675,6 +1679,7 @@ static int opt_format(const char *opt, const char *arg) static int opt_show_format_entry(const char *opt, const char *arg) { do_show_format = 1; + nb_fmt_entries_to_show++; av_dict_set(&fmt_entries_to_show, arg, "", 0); return 0; } |