1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavutil/x86
Michael Niedermayer 4257ce112c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dxa: remove useless code
  lavf: don't select an attached picture as default stream for seeking.
  avconv: remove pointless checks.
  avconv: check for get_filtered_frame() failure.
  avconv: remove a pointless check.
  swscale: convert hscale() to use named arguments.
  x86inc: add *mp named argument support to DEFINE_ARGS.
  swscale: convert hscale to cpuflags().

Conflicts:
	ffmpeg.c
	libswscale/x86/scale.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-16 01:36:49 +01:00
..
bswap.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
cpu.c Detect and check for CMOV. 2012-02-12 18:56:06 +01:00
intmath.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intreadwrite.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
timer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
w64xmmtest.h win64: add a XMM clobber test configure option. 2012-02-02 12:00:48 -08:00
x86inc.asm Merge remote-tracking branch 'qatar/master' 2012-03-16 01:36:49 +01:00
x86util.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00