Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 23:17:39 +0000 (01:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 23:17:39 +0000 (01:17 +0200)
commit5c65aed7fdfba6d5488bae4b50b9df8829587818
tree2b58106e1df66770e02c89477f72cd97a7d1803f
parentcf8c44fc47330833fadc505dfef2c2c1ae03a561
parent391ecc961ced2bde7aecb3053ac35191f838fae8
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>
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/mpegvideoenc_template.c