generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  swscale: try to use mmap only if available
  configure: check for mprotect
  wmapro: use planar sample format
  wmalossless: output in planar sample format
  wmadec: use float planar sample format output
  shorten: use planar sample format
  lavc: update documentation for AVFrame.extended_data

Conflicts:
	libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-15 14:04:35 +02:00
parent 4f5e5a0513 95cd815c36
commit ae237a117a
7 changed files with 60 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -1344,6 +1344,7 @@ HAVE_LIST="
mkstemp
mm_empty
mmap
mprotect
msvcrt
nanosleep
PeekNamedPipe
@@ -3540,6 +3541,7 @@ check_func localtime_r
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
check_func mmap
check_func mprotect
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
check_func_headers malloc.h _aligned_malloc && enable aligned_malloc
check_func setrlimit