mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02: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, see fde3bb16f90ac456709c7305b9e230e8327d8625 3cc73d3d6d2a98cd0da3deda90760729c82cdeeb 4f9297ac3b39098547863d28fbc8d2a906d5be49 Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
fb934f23e1