1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavutil/x86
Michael Niedermayer b27c7d70d8 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>
2012-07-10 20:51:51 +02:00
..
bswap.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
cpu.c Merge remote-tracking branch 'qatar/master' 2012-07-10 20:51:51 +02:00
float_dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
float_dsp.asm Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
intmath.h x86/intmath.h: Fix mull operand constraints 2012-06-26 01:08:35 +02:00
intreadwrite.h
Makefile Add a float DSP framework to libavutil 2012-06-08 13:14:38 -04:00
timer.h Merge remote-tracking branch 'qatar/master' 2012-07-08 22:33:32 +02:00
w64xmmtest.h
x86inc.asm x86inc: put basicnop under ifdef to prevent compile failure. 2012-07-07 22:48:43 +02:00
x86util.asm Merge remote-tracking branch 'qatar/master' 2012-07-05 21:55:31 +02:00