summaryrefslogtreecommitdiff
path: root/libavformat/dump.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-08 23:48:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-09 00:56:58 +0200
commitf0a6874de85fab8a9c5cb7749392f83b2aada22b (patch)
treed48ceacf340e3b81f3e96139a60fb4c5224ae0ba /libavformat/dump.c
parente051d09c58c6f51fea0ce0dab32fe92f58211ac0 (diff)
avformat: Allow choosing the dump format field separator.
The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dump.c')
-rw-r--r--libavformat/dump.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c
index f19bcaebbf..29d4aacc0e 100644
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -27,6 +27,7 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/log.h"
#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
#include "libavutil/avstring.h"
#include "libavutil/replaygain.h"
#include "libavutil/stereo3d.h"
@@ -345,6 +346,7 @@ static void dump_stream_format(AVFormatContext *ic, int i,
int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
AVStream *st = ic->streams[i];
AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
+ char *separator = ic->dump_separator;
avcodec_string(buf, sizeof(buf), st->codec, is_output);
av_log(NULL, AV_LOG_INFO, " Stream #%d:%d", index, i);
@@ -378,7 +380,7 @@ static void dump_stream_format(AVFormatContext *ic, int i,
int tbc = st->codec->time_base.den && st->codec->time_base.num;
if (fps || tbr || tbn || tbc)
- av_log(NULL, AV_LOG_INFO, "\n ");
+ av_log(NULL, AV_LOG_INFO, "%s", separator);
if (fps)
print_fps(av_q2d(st->avg_frame_rate), tbr || tbn || tbc ? "fps, " : "fps");