Merge commit '85bfaa4949f4afcde19061def3e8a18988964858'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 19:06:43 +0000 (16:06 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 19:06:43 +0000 (16:06 -0300)
commit398000abcf980d239a789da6f69811913d2fc635
tree9c3ccf20557a7d9cdace18931a18b3f525972c1b
parent94346ab593f3fc0822f11d3e3f378f9944ad2d40
parent85bfaa4949f4afcde19061def3e8a18988964858
Merge commit '85bfaa4949f4afcde19061def3e8a18988964858'

* commit '85bfaa4949f4afcde19061def3e8a18988964858':
  aarch64: vp8: Use the proper aarch64 form for conditional branches

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/aarch64/vp8dsp_neon.S