mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-25 00:33:26 +00:00
Merge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4
* commit '2d1309c3528f89bfafe1298badf39fe7a1be0542':
hevc_deblock: Fix compilation with nasm
See: c75fdee747
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
76848048c7