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)
* commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4':
  x86: Add missing colons after assembly labels

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

Simple merge
Simple merge