projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 5830036 57b753b)
Merge commit '57b753b445e23363c997a8ec1c556e0b0f6e9da3'
authorJames Almer <jamrial@gmail.com>
Thu, 12 Oct 2017 21:09:11 +0000 (18:09 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 12 Oct 2017 21:09:11 +0000 (18:09 -0300)
* 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>

Trivial merge
FFmpeg git repo