1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/tests/ref
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
..
acodec Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
lavf Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
lavfi Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
seek mxfdec: Hybrid demuxing/seeking solution 2011-12-16 11:54:03 +01:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00