diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:39:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:39:52 +0100 |
| commit | 09131ebb562472effd81726c2c14c3ec7164b695 (patch) | |
| tree | 07efcaec7b959e1900a2e821e0b0efccfd860cd6 /libavformat/crypto.c | |
| parent | be493ca2a8c4e3a1c147f172cd6ace8673d36f84 (diff) | |
| parent | a2ad554def214d2d03b7c16f68dc081a8622f9ca (diff) | |
| download | ffmpeg-09131ebb562472effd81726c2c14c3ec7164b695.tar.gz | |
Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'
* commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca':
shorten: K&R formatting cosmetics
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/crypto.c')
0 files changed, 0 insertions, 0 deletions