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)
* commit '85bfaa4949f4afcde19061def3e8a18988964858':
  aarch64: vp8: Use the proper aarch64 form for conditional branches

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

Simple merge