diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 04:29:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 05:41:42 +0200 |
| commit | 0578623039040141ceccdabf2c8d91a46d2dd0f1 (patch) | |
| tree | 87f04b4d2bc0b3257a2165a31f2fcf87608c7222 /libavformat | |
| parent | f9a13174794a28d1c5a81611552212185b2b488d (diff) | |
avformat/dump: use format dump_separator if the codec one is not set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/dump.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c index 8c49ef9236..56b37ff7d8 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -347,8 +347,14 @@ static void dump_stream_format(AVFormatContext *ic, int i, AVStream *st = ic->streams[i]; AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0); char *separator = ic->dump_separator; + char **codec_separator = av_opt_ptr(st->codec->av_class, st->codec, "dump_separator"); + int use_format_separator = !*codec_separator; + if (use_format_separator) + *codec_separator = av_strdup(separator); avcodec_string(buf, sizeof(buf), st->codec, is_output); + if (use_format_separator) + av_freep(codec_separator); av_log(NULL, AV_LOG_INFO, " Stream #%d:%d", index, i); /* the pid is an important information, so we display it */ |