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 /doc/filters.texi | |
| 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 'doc/filters.texi')
0 files changed, 0 insertions, 0 deletions