diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 15:01:15 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 15:01:15 +0100 |
| commit | 51a3e525935efc60d8d23050f0daafeb82a3df57 (patch) | |
| tree | 1d1ae3a561de848f27507ec3c08f8a5984ee10f2 | |
| parent | 1b86a6bb2cea5038a546a35d8ea844cf5487081a (diff) | |
| parent | 1339009c4924a20e872aa62897097bf5d071157c (diff) | |
| download | ffmpeg-51a3e525935efc60d8d23050f0daafeb82a3df57.tar.gz | |
Merge commit '1339009c4924a20e872aa62897097bf5d071157c'
* commit '1339009c4924a20e872aa62897097bf5d071157c':
vf_showinfo: show timebase & framerate too
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavfilter/vf_showinfo.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 5125944798..464d92daac 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -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 } }; |