[FFmpeg-cvslog] Merge commit '57b753b445e23363c997a8ec1c556e0b0f6e9da3'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Oct 12 18:09:11 2017 -0300| [fb934f23e1b7af48f96b6ce1d105da89db9ad6f4] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb934f23e1b7af48f96b6ce1d105da89db9ad6f4
---