Commit 0061ba04 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '2548834b'

* commit '2548834b':
  vf_setpts: cosmetics, reformat

Conflicts:
	libavfilter/f_setpts.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e41d3aba 2548834b
...@@ -97,10 +97,13 @@ static av_cold int init(AVFilterContext *ctx) ...@@ -97,10 +97,13 @@ static av_cold int init(AVFilterContext *ctx)
return ret; return ret;
} }
setpts->var_values[VAR_N ] = 0.0; setpts->var_values[VAR_N] = 0.0;
setpts->var_values[VAR_PREV_INPTS ] = setpts->var_values[VAR_PREV_INT ] = NAN; setpts->var_values[VAR_PREV_INPTS] = NAN;
setpts->var_values[VAR_PREV_OUTPTS] = setpts->var_values[VAR_PREV_OUTT] = NAN; setpts->var_values[VAR_PREV_INT] = NAN;
setpts->var_values[VAR_STARTPTS ] = setpts->var_values[VAR_STARTT ] = NAN; setpts->var_values[VAR_PREV_OUTPTS] = NAN;
setpts->var_values[VAR_PREV_OUTT] = NAN;
setpts->var_values[VAR_STARTPTS] = NAN;
setpts->var_values[VAR_STARTT] = NAN;
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment