diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:06:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:06:27 +0200 |
| commit | 482c1ac849faa783a1694222837c9c9cb619237f (patch) | |
| tree | 9a494c43d8a54a20b134d9007d694b4a40b6d6ad /libavfilter/libmpcodecs/vf_fspp.c | |
| parent | 1ba4cbf734b343f82e0ae4ab6be3756249771afa (diff) | |
| parent | 13f57a4d881ec669b87bf82f424bfff502433060 (diff) | |
| download | ffmpeg-482c1ac849faa783a1694222837c9c9cb619237f.tar.gz | |
Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'
* commit '13f57a4d881ec669b87bf82f424bfff502433060':
wav: K&R formatting cosmetics
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/libmpcodecs/vf_fspp.c')
0 files changed, 0 insertions, 0 deletions