diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index deb4eb9dd42e976f8e8e2cc32ff5c1a672b06614..e4dc6b33652eb38e8f1b74851fbda9c73798c265 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -25,6 +25,7 @@ #include "libavutil/adler32.h" #include "libavutil/audioconvert.h" +#include "libavutil/timestamp.h" #include "avfilter.h" typedef struct { @@ -63,11 +64,11 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) samplesref->audio->channel_layout); av_log(ctx, AV_LOG_INFO, - "n:%d pts:%"PRId64" pts_time:%f pos:%"PRId64" " + "n:%d pts:%s pts_time:%s pos:%"PRId64" " "fmt:%s chlayout:%s nb_samples:%d rate:%d planar:%d " "checksum:%08X plane_checksum[%08X %08X %08X %08X %08X %08X %08X %08X]\n", showinfo->frame, - samplesref->pts, samplesref->pts * av_q2d(inlink->time_base), + av_ts2str(samplesref->pts), av_ts2timestr(samplesref->pts, &inlink->time_base), samplesref->pos, av_get_sample_fmt_name(samplesref->format), chlayout_str, diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 9e8fcf9d28bb9cb721d3b925098a4ff1e5f651a0..92f10fa3db06535e791ee6487288b2cc5014bf1f 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -25,6 +25,7 @@ #include "libavutil/adler32.h" #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" +#include "libavutil/timestamp.h" #include "avfilter.h" typedef struct { @@ -59,11 +60,11 @@ static void end_frame(AVFilterLink *inlink) } av_log(ctx, AV_LOG_INFO, - "n:%d pts:%"PRId64" pts_time:%f pos:%"PRId64" " + "n:%d pts:%s pts_time:%s pos:%"PRId64" " "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c " "checksum:%08X plane_checksum:[%08X %08X %08X %08X]\n", showinfo->frame, - picref->pts, picref ->pts * av_q2d(inlink->time_base), picref->pos, + av_ts2str(picref->pts), av_ts2timestr(picref->pts, &inlink->time_base), picref->pos, av_pix_fmt_descriptors[picref->format].name, picref->video->sample_aspect_ratio.num, picref->video->sample_aspect_ratio.den, picref->video->w, picref->video->h,