diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:15:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:15:21 +0100 |
| commit | 3bfb7a2537cf4d876d9c29df08da522573fc0ebc (patch) | |
| tree | 4e2c7d40a16eed42f8b1a13c90ae20a0911430b3 /libavformat/srtenc.c | |
| parent | 4a1e7a6fb7b82f8e39666de9e90f7de6190ea7b1 (diff) | |
| parent | bd4ad1a1d52b8882df016826b8bdcf7b1009cb97 (diff) | |
| download | ffmpeg-3bfb7a2537cf4d876d9c29df08da522573fc0ebc.tar.gz | |
Merge commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97' into release/2.2
* commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97':
vf_frei0r: fix missing end of line character
Conflicts:
libavfilter/vf_frei0r.c
No change as the token parsing change was not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtenc.c')
0 files changed, 0 insertions, 0 deletions