diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 22:17:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 22:21:58 +0100 |
| commit | 309171bea9cd7f1213cd7ed178e5c7a032ab9a4b (patch) | |
| tree | e8aea8ff3b0615387fc102104d8dd2f7923bd0f3 /libavfilter/vf_kerndeint.c | |
| parent | adaba6a108aa9641633c529dc7da3f97f6619bc4 (diff) | |
| parent | 3407172b36a93cec410c6a287dbeec0f41257512 (diff) | |
| download | ffmpeg-309171bea9cd7f1213cd7ed178e5c7a032ab9a4b.tar.gz | |
Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'
* commit '3407172b36a93cec410c6a287dbeec0f41257512':
avienc: K&R formatting cosmetics
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_kerndeint.c')
0 files changed, 0 insertions, 0 deletions