[FFmpeg-cvslog] Merge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 28 19:05:48 2015 +0100| [76848048c7a97eb70f45531ba7443d4de1c5125b] | committer: Michael Niedermayer

Merge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4

* commit '2d1309c3528f89bfafe1298badf39fe7a1be0542':
  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=76848048c7a97eb70f45531ba7443d4de1c5125b
---