mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-28 18:32:22 +00:00
Merge commit '57b753b445e23363c997a8ec1c556e0b0f6e9da3'
* commit '57b753b445e23363c997a8ec1c556e0b0f6e9da3': build: Prefer NASM assembler over YASM build: Make x86 assembler commandline-selectable build: Special-case handling of SDL CFLAGS This commit is a noop, seefde3bb16f9
3cc73d3d6d
4f9297ac3b
Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
fb934f23e1