diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 20:04:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 20:04:35 +0100 |
| commit | 4daf8bc31b91df518b021a3927478e78e2c24e35 (patch) | |
| tree | 2a80acb5783d87aaa67324e8113aef29bcc244aa /libavfilter/lswsutils.c | |
| parent | 6bd001d76657bfcfe3cf11efd1256866a03ad329 (diff) | |
| parent | a1f5164814ac29914e079f9a936ad65d78a78e9a (diff) | |
| download | ffmpeg-4daf8bc31b91df518b021a3927478e78e2c24e35.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1dsp: K&R formatting cosmetics
Conflicts:
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/lswsutils.c')
0 files changed, 0 insertions, 0 deletions