Michael Niedermayer 3ead79eaa3 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  FATE: use updated reference for aac-latm_stereo_to_51
  avconv: use libavresample
  Add libavresample
  FATE: avoid channel mixing in lavf-dv_fmt

Conflicts:
	Changelog
	Makefile
	cmdutils.c
	configure
	doc/APIchanges
	ffmpeg.c
	tests/lavf-regression.sh
	tests/ref/lavf/dv_fmt
	tests/ref/seek/lavf_dv

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-04-25 23:17:41 +02: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

Makefile

build: Move all arch OBJS declarations into arch subdirectory Makefiles.

2012-04-12 21:30:13 +02: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

Fix compilation with NASM.

2012-04-20 21:16:12 +02:00

x86util.asm

Merge remote-tracking branch 'qatar/master'

2012-04-25 23:17:41 +02:00