Merge commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83' into release/1.1
* commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83': vf_select: Drop a debug av_log with an unchecked double to enum conversion Conflicts: libavfilter/f_select.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -298,13 +298,6 @@ static int select_frame(AVFilterContext *ctx, AVFilterBufferRef *ref)
|
||||
}
|
||||
|
||||
res = av_expr_eval(select->expr, select->var_values, NULL);
|
||||
av_log(inlink->dst, AV_LOG_DEBUG,
|
||||
"n:%d pts:%d t:%f pos:%d key:%d",
|
||||
(int)select->var_values[VAR_N],
|
||||
(int)select->var_values[VAR_PTS],
|
||||
select->var_values[VAR_T],
|
||||
(int)select->var_values[VAR_POS],
|
||||
(int)select->var_values[VAR_KEY]);
|
||||
|
||||
switch (inlink->type) {
|
||||
case AVMEDIA_TYPE_VIDEO:
|
||||
|
Reference in New Issue
Block a user