]> git.sesse.net Git - ffmpeg/commit
Merge commit '2eeac79936e83c4495cbe5905064ab797e9b45ff'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 19:06:19 +0000 (16:06 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 19:06:19 +0000 (16:06 -0300)
commit94346ab593f3fc0822f11d3e3f378f9944ad2d40
treea3fe4487584a735791f102b6c24ddd9e9c351e34
parenta2ae381b5a6f50669bcbd37001c110567a61f446
parent2eeac79936e83c4495cbe5905064ab797e9b45ff
Merge commit '2eeac79936e83c4495cbe5905064ab797e9b45ff'

* commit '2eeac79936e83c4495cbe5905064ab797e9b45ff':
  aarch64: vp8: Fix assembling with armasm64
  aarch64: vp8: Fix assembling with clang

This commit is a noop, see
c950beb68dee016e0e0a1b729d40abf700d32d1a
7ddfa5e9083baec3f9608ec5257fc94a5ae9a3ef

Merged-by: James Almer <jamrial@gmail.com>