diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 14:57:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:07:35 +0100 |
| commit | b7697d29ed772dd94cb23400154d3e47e326d151 (patch) | |
| tree | f725d8cec30ad890e1b7bbee15b8d27aff365c4e /libavformat/webvttenc.c | |
| parent | e86cd37a7026d277e81413cbdde06556742791bb (diff) | |
| parent | 2f97094608cfd2665660f7a26a3291559b186752 (diff) | |
| download | ffmpeg-b7697d29ed772dd94cb23400154d3e47e326d151.tar.gz | |
Merge commit '2f97094608cfd2665660f7a26a3291559b186752'
* commit '2f97094608cfd2665660f7a26a3291559b186752':
lagarith: do not call simd functions on unaligned lines
Conflicts:
libavcodec/lagarith.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webvttenc.c')
0 files changed, 0 insertions, 0 deletions