Merge commit '1339009c4924a20e872aa62897097bf5d071157c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 14:01:15 +0000 (15:01 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 14:01:15 +0000 (15:01 +0100)
* commit '1339009c4924a20e872aa62897097bf5d071157c':
  vf_showinfo: show timebase & framerate too

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavfilter/vf_showinfo.c

@@@ -188,10 -165,11 +187,10 @@@ static int config_props_out(AVFilterLin
  
  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,
 -        .get_video_buffer = ff_null_get_video_buffer,
+         .filter_frame     = filter_frame,
+         .config_props     = config_props_in,
      },
      { NULL }
  };