diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:20:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:20:20 +0100 |
| commit | ffe33500983983946048def3a6047920d97d957b (patch) | |
| tree | af118d7e0ca3491233ddcf201b8a8beee2fb8f4d /CREDITS | |
| parent | ec5e02d49573975ee4bc73be173a2fad76d808ff (diff) | |
| parent | ee80cf741a44115758e62399b7bde08d33161151 (diff) | |
| download | ffmpeg-streaming-ffe33500983983946048def3a6047920d97d957b.zip ffmpeg-streaming-ffe33500983983946048def3a6047920d97d957b.tar.gz | |
Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'
* commit 'ee80cf741a44115758e62399b7bde08d33161151':
avfilter: x86: K&R formatting cosmetics
Conflicts:
libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions
