diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 10:24:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 10:24:45 +0200 |
| commit | 0061ba044a44517d7291b80427cdebc5a1470c69 (patch) | |
| tree | 4267adc19a7da710fd2aab2214599b6a9ebf9184 /libavfilter | |
| parent | e41d3aba0123c1089b55aa7dc6371973a0c3a39e (diff) | |
| parent | 2548834b2248ad4d7da9bd0afed09d7d0cddeeb0 (diff) | |
| download | ffmpeg-0061ba044a44517d7291b80427cdebc5a1470c69.tar.gz | |
Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'
* commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0':
vf_setpts: cosmetics, reformat
Conflicts:
libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/f_setpts.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavfilter/f_setpts.c b/libavfilter/f_setpts.c index c0fd42257b..648eec0802 100644 --- a/libavfilter/f_setpts.c +++ b/libavfilter/f_setpts.c @@ -97,10 +97,13 @@ static av_cold int init(AVFilterContext *ctx) return ret; } - 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_OUTPTS] = setpts->var_values[VAR_PREV_OUTT] = NAN; - setpts->var_values[VAR_STARTPTS ] = setpts->var_values[VAR_STARTT ] = NAN; + setpts->var_values[VAR_N] = 0.0; + setpts->var_values[VAR_PREV_INPTS] = NAN; + setpts->var_values[VAR_PREV_INT] = 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; } |