Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Aug 2012 20:39:25 +0000 (22:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Aug 2012 21:51:43 +0000 (23:51 +0200)
commite776ee8f294984f7643a3c45db803c7266e1edfd
treea1fd00ab7a0760ec0f2848aed9dc3f79d889e816
parent88fc1438c693ffb7793aeb111d89775440491840
parent8821ae649e61097ec57ca58472c3e4239c82913c
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>
44 files changed:
Doxyfile
configure
doc/APIchanges
libavcodec/arm/vp56_arith.h
libavcodec/dct-test.c
libavcodec/motion-test.c
libavcodec/x86/ac3dsp.asm
libavcodec/x86/ac3dsp_mmx.c
libavcodec/x86/cavsdsp_mmx.c
libavcodec/x86/dct32_sse.asm
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fft_mmx.asm
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264dsp_mmx.c
libavcodec/x86/motion_est_mmx.c
libavcodec/x86/mpegvideo_mmx.c
libavcodec/x86/mpegvideo_mmx_template.c
libavcodec/x86/pngdsp-init.c
libavcodec/x86/rv40dsp_init.c
libavcodec/x86/snowdsp_mmx.c
libavcodec/x86/vc1dsp_mmx.c
libavcodec/x86/vp3dsp_init.c
libavcodec/x86/vp8dsp-init.c
libavfilter/x86/gradfun.c
libavfilter/x86/yadif.c
libavresample/utils.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/utils.c
libavutil/version.h
libavutil/x86/cpu.c
libswscale/swscale.c
libswscale/swscale.h
libswscale/utils.c
libswscale/version.h
libswscale/x86/rgb2rgb.c
libswscale/x86/rgb2rgb_template.c
libswscale/x86/swscale.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c
libswscale/x86/yuv2rgb_template.c
tests/fate/lossless-video.mak