Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:05:27 +0000 (18:05 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:05:27 +0000 (18:05 -0300)
commit29db87af522c22c74be1689fb8c71bf1872482c8
tree72272196a8b2dd4f4a0546d9db9514215521d5a6
parentf23078904f99fc6d19d05013d8ef132c386ec8b8
parent6be7944ee2ec2f045e6eb9a93237e992c8b20ac4
Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'

* commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4':
  x86: Add missing colons after assembly labels

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/x86/audiodsp.asm
libavutil/x86/imgutils.asm