diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-02 21:44:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-02 21:44:44 +0100 |
| commit | 411f8f4c9a05796e22e12bf0a22c967f28c2d430 (patch) | |
| tree | 6443c412bc0e64ad2e0b8eb27b19ecc552427913 /libavutil/lls2.h | |
| parent | dfefc9097e9b4bb20442e65454a40043bd189b3d (diff) | |
| parent | 5c9c305d14730faf2af206e5d519df4948de0ed2 (diff) | |
| download | ffmpeg-411f8f4c9a05796e22e12bf0a22c967f28c2d430.tar.gz | |
Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'
* commit '5c9c305d14730faf2af206e5d519df4948de0ed2':
ass: K&R formatting cosmetics
Conflicts:
libavformat/assdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lls2.h')
0 files changed, 0 insertions, 0 deletions