third_party_ffmpeg/libavresample
Michael Niedermayer e776ee8f29 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavr: fix handling of custom mix matrices
  fate: force pix_fmt in lagarith-rgb32 test
  fate: add tests for lagarith lossless video codec.
  ARMv6: vp8: fix stack allocation with Apple's assembler
  ARM: vp56: allow inline asm to build with clang
  fft: 3dnow: fix register name typo in DECL_IMDCT macro
  x86: dct32: port to cpuflags
  x86: build: replace mmx2 by mmxext
  Revert "wmapro: prevent division by zero when sample rate is unspecified"
  wmapro: prevent division by zero when sample rate is unspecified
  lagarith: fix color plane inversion for YUY2 output.
  lagarith: pad RGB buffer by 1 byte.
  dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.

Conflicts:
	doc/APIchanges
	libavcodec/lagarith.c
	libavfilter/x86/gradfun.c
	libavutil/cpu.h
	libavutil/version.h
	libswscale/utils.c
	libswscale/version.h
	libswscale/x86/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-04 23:51:43 +02:00
..
x86 lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro 2012-07-27 14:21:32 -04:00
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix_matrix.c lavr: fix handling of custom mix matrices 2012-08-04 10:28:22 -04:00
audio_mix.c lavr: fix handling of custom mix matrices 2012-08-04 10:28:22 -04:00
audio_mix.h lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type 2012-05-01 13:52:59 -04:00
avresample-test.c
avresample.h lavr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-08 15:22:11 -04:00
internal.h lavr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-08 15:22:11 -04:00
libavresample.v
Makefile build: cosmetics: Add missing end-of-line backslashes to item lists. 2012-05-07 14:17:40 +02:00
options.c lavr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-08 15:22:11 -04:00
resample_template.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
resample.c lavr: resampling: add support for s32p, fltp, and dblp internal sample formats 2012-07-08 15:22:11 -04:00
resample.h
utils.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
version.h Clarify Doxygen comment for FF_API_* #defines. 2012-07-04 15:10:10 +02:00