]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 20:46:48 +0000 (17:46 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 20:46:48 +0000 (17:46 -0300)
* commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d':
  aarch64: Get rid of a stray double space

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavutil/aarch64/asm.S

Simple merge