Merge commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:35:49 +0000 (18:35 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:35:49 +0000 (18:35 -0300)
commitbac44a50206ec565068d6a9e3241742d33e02406
tree5c4616683c7941eaf2bab7cb03594f344109b3d7
parentacf125f3336b38663b3694320518283227cee60a
parentb89804da9bad2d94dd95bf20ac6187447e9c17e9
Merge commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9'

* commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9':
  x86: videodsp: Add parentheses to expression to work around warning

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/x86/videodsp.asm