aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-11-03 09:57:27 -0800
committerAnton Khirnov <anton@khirnov.net>2015-11-09 08:15:23 +0100
commit1339009c4924a20e872aa62897097bf5d071157c (patch)
tree68a23ac3c56373e2c307bcb1c93b23ca10c0b6e6 /libavfilter
parent11f87ca71e9c7b917f594194f827fd040d1df5ca (diff)
downloadffmpeg-1339009c4924a20e872aa62897097bf5d071157c.tar.gz
vf_showinfo: show timebase & framerate too
(cherry picked from ffmpeg commit fdb93996811bacfa7b82995cdc0f93c46f3dc6cc) Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_showinfo.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index ede1765d1e..204ff7a857 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -140,12 +140,36 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
return ff_filter_frame(inlink->dst->outputs[0], frame);
}
+static int config_props(AVFilterContext *ctx, AVFilterLink *link, int is_out)
+{
+
+ av_log(ctx, AV_LOG_INFO, "config %s time_base: %d/%d, frame_rate: %d/%d\n",
+ is_out ? "out" : "in",
+ link->time_base.num, link->time_base.den,
+ link->frame_rate.num, link->frame_rate.den);
+
+ return 0;
+}
+
+static int config_props_in(AVFilterLink *link)
+{
+ AVFilterContext *ctx = link->dst;
+ return config_props(ctx, link, 0);
+}
+
+static int config_props_out(AVFilterLink *link)
+{
+ AVFilterContext *ctx = link->src;
+ return config_props(ctx, link, 1);
+}
+
static const AVFilterPad avfilter_vf_showinfo_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = ff_null_get_video_buffer,
.filter_frame = filter_frame,
+ .config_props = config_props_in,
},
{ NULL }
};
@@ -153,7 +177,8 @@ static const AVFilterPad avfilter_vf_showinfo_inputs[] = {
static const AVFilterPad avfilter_vf_showinfo_outputs[] = {
{
.name = "default",
- .type = AVMEDIA_TYPE_VIDEO
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = config_props_out,
},
{ NULL }
};