mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-27 13:10:37 +00:00
Merge commit '1339009c4924a20e872aa62897097bf5d071157c'
* commit '1339009c4924a20e872aa62897097bf5d071157c': vf_showinfo: show timebase & framerate too Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
51a3e52593
@ -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",
|
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->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;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -188,10 +187,10 @@ static int config_props_out(AVFilterLink *link)
|
|||||||
|
|
||||||
static const AVFilterPad avfilter_vf_showinfo_inputs[] = {
|
static const AVFilterPad avfilter_vf_showinfo_inputs[] = {
|
||||||
{
|
{
|
||||||
.name = "default",
|
.name = "default",
|
||||||
.type = AVMEDIA_TYPE_VIDEO,
|
.type = AVMEDIA_TYPE_VIDEO,
|
||||||
.filter_frame = filter_frame,
|
.filter_frame = filter_frame,
|
||||||
.config_props = config_props_in,
|
.config_props = config_props_in,
|
||||||
},
|
},
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user