git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	James Almer <jamrial@gmail.com>
	Sat, 11 Nov 2017 19:09:09 +0000 (16:09 -0300)
committer	James Almer <jamrial@gmail.com>
	Sat, 11 Nov 2017 19:09:09 +0000 (16:09 -0300)
commit	869401cefc22e221edbf135bacaa1f21014fd001
tree	731ddba643d8a14dcd515e326b39caac51c18aa3	tree \| snapshot
parent	084e7fbe49fb0935b733726c2b0f7e6ce9553874	commit \| diff
parent	29ccc641b17afad058a5c24071ea827865a8b3a9	commit \| diff

Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'

* commit '29ccc641b17afad058a5c24071ea827865a8b3a9':
build: Drop check for sys/mman.h in favor of mmap() check

Merged-by: James Almer <jamrial@gmail.com>

configure	diff1 \|	diff2 \|	blob \| history
libswscale/utils.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

configure	diff1 \|	diff2 \|	blob \| history
libswscale/utils.c	diff1 \|	diff2 \|	blob \| history