Merge commit '1339009c4924a20e872aa62897097bf5d071157c'
* commit '1339009c4924a20e872aa62897097bf5d071157c': vf_showinfo: show timebase & framerate too Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
		@@ -168,8 +168,7 @@ 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;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user