Merge commit '36a6fb989b017898041703025ef20028146675a8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:52:43 +0000 (11:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:53:51 +0000 (11:53 +0100)
* commit '36a6fb989b017898041703025ef20028146675a8':
  hevc_deblock: Fix compilation with nasm

See: c75fdee747179e21e3cc137b2565ba911b17f9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge