diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:29:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:29:24 +0100 |
| commit | 6776c2c04fe6af2efe0c7f7eb61497d0003984c3 (patch) | |
| tree | 4b8be127bd421e63f53eb78fe999665767c6f0c6 /libavformat/mpsubdec.c | |
| parent | facd3dbc6e0788f0e693a83e6ef16918b7eb960b (diff) | |
| parent | f1de93dec302cc860c718e89656f184510b2d239 (diff) | |
| download | ffmpeg-6776c2c04fe6af2efe0c7f7eb61497d0003984c3.tar.gz | |
Merge commit 'f1de93dec302cc860c718e89656f184510b2d239' into release/2.2
* commit 'f1de93dec302cc860c718e89656f184510b2d239':
http: K&R formatting cosmetics
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpsubdec.c')
0 files changed, 0 insertions, 0 deletions