Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 May 2012 20:29:04 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 May 2012 20:32:05 +0000 (22:32 +0200)
commit703e920bb75053bf6b87d41d198cbbfbce3fb7ad
tree97b86b3ae104e48e6098fc0c1c243e096e4cdd32
parent4d3787763218de4c3e838b31f0fb2153b8d6af20
parent6ce51a9b392aaf647c4cdfd149fff1af5259a6fd
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>
25 files changed:
Makefile
libavcodec/indeo3.c
libavcodec/tta.c
libavcodec/x86/ac3dsp.asm
libavcodec/x86/ac3dsp_mmx.c
libavcodec/x86/rv40dsp.asm
libavformat/utils.c
tests/fate-run.sh
tests/fate/demux.mak
tests/fate/video.mak
tests/lavf-regression.sh
tests/ref/lavf/ts
tests/ref/vsynth1/cljr
tests/ref/vsynth1/ffvhuff
tests/ref/vsynth1/r210
tests/ref/vsynth1/v308
tests/ref/vsynth1/y41p
tests/ref/vsynth1/yuv4
tests/ref/vsynth2/cljr
tests/ref/vsynth2/ffvhuff
tests/ref/vsynth2/r210
tests/ref/vsynth2/v308
tests/ref/vsynth2/y41p
tests/ref/vsynth2/yuv4
tests/regression-funcs.sh