diff options
| author | Michael Niedermayer | 2014-07-04 01:17:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2014-07-04 01:17:39 +0200 |
| commit | 5c65aed7fdfba6d5488bae4b50b9df8829587818 (patch) | |
| tree | 2b58106e1df66770e02c89477f72cd97a7d1803f /libswresample/resample.c | |
| parent | cf8c44fc47330833fadc505dfef2c2c1ae03a561 (diff) | |
| parent | 391ecc961ced2bde7aecb3053ac35191f838fae8 (diff) | |
Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'
* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase
Conflicts:
libavcodec/x86/mpegvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample.c')
0 files changed, 0 insertions, 0 deletions