avformat/dump: use format dump_separator if the codec one is not set
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 02:29:42 +0000 (04:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 03:41:42 +0000 (05:41 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dump.c

index 8c49ef9..56b37ff 100644 (file)
@@ -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 */