Merge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:05:48 +0000 (19:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:06:00 +0000 (19:06 +0100)
commit76848048c7a97eb70f45531ba7443d4de1c5125b
tree541ba712b7623f8a183d6d1c0c1aafe548a66d1b
parent1172107d570baa6f01d5c11584090a8cbe552e14
parent2d1309c3528f89bfafe1298badf39fe7a1be0542
Merge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4

* commit '2d1309c3528f89bfafe1298badf39fe7a1be0542':
  hevc_deblock: Fix compilation with nasm

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