1. 10 Jan, 2012 3 commits
    • Michael Niedermayer's avatar
      fate: Disable fate-wmv8-x8intra · 2169f971
      Michael Niedermayer authored
      This test does not work on all platforms and until it does
      it just hides new failures, which is really bad.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      2169f971
    • anonymous's avatar
      mjpeg: update whitespaces to qatar · 7e2ba2df
      anonymous authored
      7e2ba2df
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · dd3ca3ea
      Michael Niedermayer authored
      * qatar/master:
        fate: Add tests for more AAC features.
        aacps: Add missing newline in error message.
        fate: Add tests for vc1/wmapro in ism.
        aacdec: Add a fate test for 5.1 channel SBR.
        aacdec: Turn off PS for multichannel files that use PCE based configs.
        cabac: remove put_cabac_u/ueg from cabac-test.
        swscale: RGB4444 and BGR444 input
        FATE: add test for xWMA demuxer.
        FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder.
        mpegaudiodec: optimized iMDCT transform
        mpegaudiodec: change imdct window arrangment for better pointer alignment
        mpegaudiodec: move imdct and windowing function to mpegaudiodsp
        mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations
        swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm.
        FATE: test to exercise WTV demuxer.
        mjpegdec: K&R formatting cosmetics
        swscale: K&R formatting cosmetics for code examples
        swscale: K&R reformatting cosmetics for header files
        FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised.
      
      Conflicts:
      	libavcodec/cabac.c
      	libavcodec/mjpegdec.c
      	libavcodec/mpegaudiodec.c
      	libavcodec/mpegaudiodsp.c
      	libavcodec/mpegaudiodsp.h
      	libavcodec/mpegaudiodsp_template.c
      	libavcodec/x86/Makefile
      	libavcodec/x86/imdct36_sse.asm
      	libavcodec/x86/mpegaudiodec_mmx.c
      	libswscale/swscale-test.c
      	libswscale/swscale.c
      	libswscale/swscale_internal.h
      	libswscale/x86/swscale_template.c
      	tests/fate/demux.mak
      	tests/fate/microsoft.mak
      	tests/fate/video.mak
      	tests/fate/wma.mak
      	tests/ref/lavfi/pixfmts_scale
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      dd3ca3ea
  2. 09 Jan, 2012 29 commits
  3. 08 Jan, 2012 8 commits