1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Michael Niedermayer 703e920bb7 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: Work around non-standard wc implementations at more places
  fate: work around non-standard wc implementations
  x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions.
  ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16
  fate: use standard diff options
  tta: Fix comment about channel number; TTA supports >2 channels.
  avfilter: Move ff_get_ref_perms_string() to where it is used.
  build: Add 'check' target to run all compile and test targets.
  indeo3: validate new frame size before resetting decoder
  indeo3: when freeing buffers, set pointers referencing them to NULL as well
  indeo3: initialise pixel planes on allocation
  indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder
  fate: rename psx-str-v3-mdec to mdec-v3
  fate: convert psx-str to a demuxer test
  lavf: add mdec to is_intra_only() list

Conflicts:
	doc/developer.texi
	libavcodec/indeo3.c
	libavfilter/video.c
	libavformat/utils.c
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/lavf-regression.sh
	tests/ref/vsynth1/cljr
	tests/ref/vsynth1/ffvhuff
	tests/ref/vsynth2/cljr
	tests/ref/vsynth2/ffvhuff

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-16 22:32:05 +02:00
..
2012-02-26 07:48:45 +01:00
2012-05-08 16:53:03 +02:00
bfi
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
caf
2012-05-14 13:05:30 +01:00
2012-05-10 04:17:03 +02:00
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
crc
2012-05-15 19:47:18 +01:00
2012-02-26 07:48:45 +01:00
dpx
2012-02-26 07:48:45 +01:00
2012-04-01 11:01:08 +02:00
2012-03-02 18:58:19 +02:00
2012-02-26 07:48:45 +01:00
2012-03-27 17:54:04 -07:00
2012-03-23 14:03:03 -07:00
2012-03-20 14:12:53 -04:00
md5
2012-02-26 07:48:45 +01:00
mtv
2012-05-15 11:16:34 +02:00
2012-05-14 12:50:01 +01:00
ptx
2012-02-26 07:48:45 +01:00
2012-04-01 15:56:08 -04:00
rl2
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
sha
smc
2012-02-26 07:48:45 +01:00
2012-05-15 00:03:40 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
tmv
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
vp5
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-03-03 17:03:26 -05:00
w64
2012-02-26 07:48:45 +01:00
yop
2012-03-22 19:52:56 +01:00