• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 703e920b
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    703e920b
cljr 238 Bytes