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