diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-09-26 14:37:40 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-10-08 18:17:49 +0100 |
| commit | 20a5956b8daeee4cb59d6fa00ec809b02c04d7f8 (patch) | |
| tree | bf691a44ac7794a723ae2157778ad7defd866a85 /libavformat | |
| parent | 5a419b2dd1881889d436f55741fd3ff3f9f436c4 (diff) | |
| download | ffmpeg-20a5956b8daeee4cb59d6fa00ec809b02c04d7f8.tar.gz | |
dump: split audio and video probing on multiple lines
Also always report pixel format.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/dump.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c index 58ed6547a0..649678cd4a 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -116,11 +116,11 @@ static void print_fps(double d, const char *postfix) { uint64_t v = lrintf(d * 100); if (v % 100) - av_log(NULL, AV_LOG_INFO, ", %3.2f %s", d, postfix); + av_log(NULL, AV_LOG_INFO, "%3.2f %s", d, postfix); else if (v % (100 * 1000)) - av_log(NULL, AV_LOG_INFO, ", %1.0f %s", d, postfix); + av_log(NULL, AV_LOG_INFO, "%1.0f %s", d, postfix); else - av_log(NULL, AV_LOG_INFO, ", %1.0fk %s", d / 1000, postfix); + av_log(NULL, AV_LOG_INFO, "%1.0fk %s", d / 1000, postfix); } static void dump_metadata(void *ctx, AVDictionary *m, const char *indent) @@ -357,11 +357,17 @@ static void dump_stream_format(AVFormatContext *ic, int i, } if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { - if (st->avg_frame_rate.den && st->avg_frame_rate.num) - print_fps(av_q2d(st->avg_frame_rate), "fps"); - if (st->time_base.den && st->time_base.num) - print_fps(1 / av_q2d(st->time_base), "tbn"); - if (st->codec->time_base.den && st->codec->time_base.num) + int fps = st->avg_frame_rate.den && st->avg_frame_rate.num; + int tbn = st->time_base.den && st->time_base.num; + int tbc = st->codec->time_base.den && st->codec->time_base.num; + + if (fps || tbn || tbc) + av_log(NULL, AV_LOG_INFO, "\n "); + if (fps) + print_fps(av_q2d(st->avg_frame_rate), tbn || tbc ? "fps, " : "fps"); + if (tbn) + print_fps(1 / av_q2d(st->time_base), tbc ? "tbn, " : "tbn"); + if (tbc) print_fps(1 / av_q2d(st->codec->time_base), "tbc"); } |