1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
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
..
2012-07-11 04:04:29 +02:00
2012-07-16 19:30:13 +00:00
2012-04-20 09:43:11 -04:00
2012-04-20 09:43:11 -04:00
2012-01-22 23:06:04 +01:00
2012-07-04 15:45:05 +02:00
2012-07-04 15:45:05 +02:00
2012-05-15 18:08:32 +02:00
2012-05-15 18:08:32 +02:00
2012-06-06 20:01:08 +02:00
2012-06-09 02:51:02 +02:00
2012-07-07 01:41:55 +00:00
2012-07-05 08:21:49 +02:00
2012-06-07 22:13:59 +02:00
2012-07-06 17:08:22 +02:00
2012-07-04 23:23:09 +02:00