diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-02-09 19:30:26 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-02-14 18:01:43 +0100 |
| commit | 175ab5f9a923343dbeb3914a185c223c43702d95 (patch) | |
| tree | 30e2e9c2cfa6029816717119471f456ad09f73ea /libavfilter | |
| parent | 5d12b83ff1b6d5e5dad159429bd6864f17b0ed0f (diff) | |
| download | ffmpeg-175ab5f9a923343dbeb3914a185c223c43702d95.tar.gz | |
lavfi/*showinfo: use av_ts2* macros in showinfo and ashowinfo
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_ashowinfo.c | 5 | ||||
| -rw-r--r-- | libavfilter/vf_showinfo.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index deb4eb9dd4..e4dc6b3365 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 9e8fcf9d28..92f10fa3db 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, |