[FFmpeg-cvslog] Merge commit '36a6fb989b017898041703025ef20028146675a8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 23 11:52:43 2015 +0100| [c0f02b220182cc7997bd6b5279881b898f52dfbf] | committer: Michael Niedermayer

Merge commit '36a6fb989b017898041703025ef20028146675a8'

* commit '36a6fb989b017898041703025ef20028146675a8':
  hevc_deblock: Fix compilation with nasm

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0f02b220182cc7997bd6b5279881b898f52dfbf
---