[FFmpeg-cvslog] lavfi/*showinfo: use av_ts2* macros in showinfo and ashowinfo
Stefano Sabatini
git at videolan.org
Tue Feb 14 18:04:04 CET 2012
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Feb 9 19:30:26 2012 +0100| [175ab5f9a923343dbeb3914a185c223c43702d95] | committer: Stefano Sabatini
lavfi/*showinfo: use av_ts2* macros in showinfo and ashowinfo
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=175ab5f9a923343dbeb3914a185c223c43702d95
---
libavfilter/af_ashowinfo.c | 5 +++--
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 deb4eb9..e4dc6b3 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 9e8fcf9..92f10fa 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,
More information about the ffmpeg-cvslog
mailing list