Merge commit '2548834b'
* commit '2548834b': vf_setpts: cosmetics, reformat Conflicts: libavfilter/f_setpts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '2548834b': vf_setpts: cosmetics, reformat Conflicts: libavfilter/f_setpts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>