diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-10 11:16:27 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-10 11:16:27 +0200 |
| commit | e1def4ffec209c0949807f8c505539dc6d709c31 (patch) | |
| tree | f0e4d809b96fe7c20c14afc8415815a2dcb6e9f1 /libavformat/subtitles.h | |
| parent | b1d547fe024a3ba223e4d0d7f73617b71d629827 (diff) | |
| parent | 1542ec96389f32e5081c6c607e4b6f5e257ccdf2 (diff) | |
| download | ffmpeg-e1def4ffec209c0949807f8c505539dc6d709c31.tar.gz | |
Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'
* commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2':
cosmetics: Drop spurious spaces from if clauses
Conflicts:
libavcodec/vc1_block.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/subtitles.h')
0 files changed, 0 insertions, 0 deletions