diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 21:45:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 21:45:39 +0200 |
| commit | 9c41b59423bbb86685c05bcf3ef9d4a7efb54f34 (patch) | |
| tree | 1af9635e45836c894309762f84c93ed4d29615de /libswresample | |
| parent | ffa90d99fd8933b17917045a3768bb9dcfb56f72 (diff) | |
| parent | 0a024268261d05ccdcf7e03c85fb78d22037a464 (diff) | |
| download | ffmpeg-9c41b59423bbb86685c05bcf3ef9d4a7efb54f34.tar.gz | |
Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'
* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
libxvid: K&R formatting cosmetics
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions