Commit 51a3e525 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit '1339009c'

* commit '1339009c':
  vf_showinfo: show timebase & framerate too
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 1b86a6bb 1339009c
......@@ -166,10 +166,9 @@ 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",
is_out ? "out" : "in",
link->time_base.num, link->time_base.den,
link->frame_rate.num, link->frame_rate.den
);
link->frame_rate.num, link->frame_rate.den);
return 0;
}
......@@ -188,10 +187,10 @@ static int config_props_out(AVFilterLink *link)
static const AVFilterPad avfilter_vf_showinfo_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_props_in,
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_props_in,
},
{ NULL }
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment