diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-10 20:51:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-10 20:51:51 +0200 |
| commit | b27c7d70d8ea6e589d0838f0d2529b99928b7192 (patch) | |
| tree | 3ec19e69d80a6660230c964e0b37935c2f280412 /configure | |
| parent | e346176de9809afec3724139ee320b613f753062 (diff) | |
| parent | ed219ed36606be307403b46f969a82bf0568865b (diff) | |
| download | ffmpeg-b27c7d70d8ea6e589d0838f0d2529b99928b7192.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mss1: fix decoding masked regions in interframes
mxfdec: fix off by one error.
mxfdec: only parse next partition pack if parsing forward
mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only
mxfdec: fix frame height vs field height confusion
mxfdec: Add intra_only flag to MXFTrack
mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a
mxfdec: truncate packets that extend past the next edit unit
mxfdec: set pixel format for cdci picture formats
mxfdec: detect uncomp pictures using essence container ul
mxfdec: set track edit rate num/den in expected order
x86/cpu: implement get/set_eflags using intrinsics
x86/cpu: implement support for cpuid through intrinsics
x86/cpu: implement support for xgetbv through intrinsics
lavu: use intrinsics for emms on systems lacking inline asm support
mem: Don't abort on av_malloc(0) in debug mode
Conflicts:
configure
libavformat/mxf.h
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1188,6 +1188,7 @@ HAVE_LIST=" clock_gettime closesocket cmov + cpuid dcbzl dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@ -1246,6 +1247,7 @@ HAVE_LIST=" MapViewOfFile memalign mkstemp + mm_empty mmap nanosleep netinet_sctp_h @@ -1256,6 +1258,7 @@ HAVE_LIST=" rdtsc round roundf + rweflags sched_getaffinity sdl sdl_video_size @@ -1300,6 +1303,7 @@ HAVE_LIST=" windows_h winsock2_h xform_asm + xgetbv xmm_clobbers yasm " @@ -3055,7 +3059,12 @@ elif enabled sparc; then elif enabled x86; then + check_code ld immintrin.h "__xgetbv(0)" "cc" && enable xgetbv + check_code ld intrin.h "int info[4]; __cpuid(info, 0)" "cc" && enable cpuid check_code ld intrin.h "__rdtsc()" "cc" && enable rdtsc + check_code ld intrin.h "unsigned int x = __readeflags()" "cc" && enable rweflags + + check_code ld mmintrin.h "_mm_empty()" "cc" && enable mm_empty enable local_aligned_8 local_aligned_16 |