1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
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-29 22:02:46 +02:00
2012-06-29 20:20:02 +02:00
2012-07-22 05:23:27 +02:00
2012-07-25 09:26:17 +02:00
2012-07-06 02:19:21 +00:00
2012-07-07 12:33:51 +02:00
2012-07-07 12:34:04 +02:00
2012-08-03 14:50:26 +02:00
2012-08-04 00:05:56 +02:00
2012-07-28 01:18:04 +02:00
2012-07-19 18:44:46 +02:00
2012-08-02 21:58:03 +02:00
2012-08-02 21:58:17 +02:00
2012-08-01 04:19:27 +02:00
2012-08-03 23:50:09 +02:00
2012-07-26 16:33:17 +02:00
2012-07-26 16:33:39 +02:00
2012-07-10 02:17:53 +02:00
2012-07-10 02:17:52 +02:00
2012-07-10 02:17:52 +02:00
2012-07-10 02:17:52 +02:00
2012-07-24 05:17:36 +02:00
2012-07-25 21:35:30 +02:00
2012-07-01 18:04:08 +02:00
2012-07-03 13:06:23 +00:00
2012-07-22 05:18:01 +02:00
2012-07-12 23:18:48 +02:00
2012-07-25 21:35:48 +02:00
2012-07-29 16:13:07 +02:00
2012-07-31 17:25:42 +02:00
2012-07-18 16:22:41 +02:00
2012-07-26 17:42:42 +02:00
2012-07-26 17:45:44 +02:00
2012-07-09 15:38:28 +02:00
2012-07-08 17:59:56 +02:00
2012-07-05 02:54:34 +00:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-07-29 22:02:46 +02:00
2012-07-29 22:02:46 +02:00
2012-07-17 17:06:24 +00:00
2012-07-05 04:23:55 +02:00
2012-07-15 14:49:32 +02:00
2012-07-02 20:52:22 +02:00
2012-06-29 20:21:28 +02:00
2012-07-07 22:33:13 +00:00
2012-07-08 23:43:18 +00:00
2012-07-31 17:23:32 +02:00
2012-07-26 22:22:54 +02:00
2012-07-17 01:23:35 +00:00
2012-07-17 01:23:35 +00:00
2012-07-14 13:02:51 +02:00
2012-07-26 10:08:49 +02:00
2012-07-02 20:52:36 +02:00
2012-06-29 20:43:30 +02:00
2012-07-02 12:48:29 +02:00