diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 10:50:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 10:50:05 +0200 |
| commit | e381cc3e4ea61b5d42b45162ef6969a90a0507c9 (patch) | |
| tree | db9e457d9aa2eb4129d0a189d1890338d91a1fc1 /libswscale/swscale.h | |
| parent | de9fbf3dc41abb8eb7a70b8a6bbfce64cee21bc5 (diff) | |
| parent | 1c88617b9421c9af8ae961c05d2381b19c585026 (diff) | |
| download | ffmpeg-e381cc3e4ea61b5d42b45162ef6969a90a0507c9.tar.gz | |
Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'
* commit '1c88617b9421c9af8ae961c05d2381b19c585026':
riff: K&R formatting cosmetics
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.h')
0 files changed, 0 insertions, 0 deletions