Michael Niedermayer e986a5d10d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  FATE: add tests for targa
  ARM: fix Thumb-mode simple_idct_arm
  ARM: 4-byte align start of all asm functions
  rgb2rgb: rgb12to15()
  swscale-test: fix stack overread.
  swscale: fix invalid conversions and memory problems.
  cabac: split cabac.h into declarations and function definitions
  cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
  cabac: Remove ff_h264_lps_state array.

Conflicts:
	libswscale/rgb2rgb.h
	libswscale/swscale_unscaled.c
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-14 02:22:09 +01:00
..
2012-01-03 16:28:17 -05:00
2012-01-14 01:17:06 +01:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2011-12-28 22:05:24 +01:00
2011-12-30 20:00:53 +01:00
2012-01-14 01:15:42 +01:00
2011-12-19 16:30:30 +01:00
2011-12-30 20:00:53 +01:00
2012-01-11 08:56:24 -05:00
2012-01-11 08:56:24 -05:00
2011-12-23 05:58:32 +01:00
2012-01-12 16:32:55 +01:00
2012-01-07 00:11:43 +01:00
2012-01-12 16:32:55 +01:00
2012-01-14 01:13:20 +01:00
2011-12-30 20:00:53 +01:00
2012-01-07 19:23:21 +01:00
2011-12-30 20:00:53 +01:00
2012-01-12 17:02:13 +01:00
2012-01-12 09:52:33 +01:00
2012-01-12 09:52:33 +01:00
2012-01-14 01:14:51 +01:00
2011-12-30 20:00:53 +01:00
2011-12-23 11:39:41 +01:00
2012-01-14 01:10:13 +01:00
2012-01-14 01:10:13 +01:00
2012-01-11 18:14:13 +01:00
2012-01-11 18:14:13 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-14 01:34:16 +01:00
2012-01-03 23:52:28 +01:00