1. 29 Jun, 2011 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · bb9d5171
      Michael Niedermayer authored
      * qatar/master: (21 commits)
        swscale: Add Doxygen for hyscale_fast/hScale.
        fate: enable lavfi-pixmt tests on big endian systems
        PPC: swscale: disable altivec functions for unsupported formats
        fate: merge identical pixdesc_be/le tests
        swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
        build: call texi2pod.pl with full path instead of symlink
        build: include sub-makefiles using full path instead of symlinks
        swscale: update big endian reference values after dff5a835.
        wavpack: skip blocks with no samples
        cosmetics: remove outdated comment that is no longer true
        build: replace some addprefix/addsuffix with substitution refs
        avutil: Remove unused arbitrary precision integer code.
        configure: Drop check for availability of ten assembler operands.
        aacenc: Save channel configuration for later use.
        aacenc: Fix codebook trellising for zeroed bands.
        swscale: change prototypes of scaled YUV output functions.
        swscale: re-add support for non-native endianness.
        swscale: disentangle yuv2rgbX_c_full() into small functions.
        swscale: split yuv2packed[12X]_c() remainders into small functions.
        swscale: split yuv2packedX_altivec in smaller functions.
        ...
      
      Conflicts:
      	Makefile
      	configure
      	libavcodec/x86/dsputil_mmx.c
      	libavfilter/Makefile
      	libavformat/Makefile
      	libavutil/integer.c
      	libavutil/integer.h
      	libswscale/swscale.c
      	libswscale/swscale_internal.h
      	libswscale/x86/swscale_template.c
      	tests/ref/lavfi/pixdesc_le
      	tests/ref/lavfi/pixfmts_scale
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      bb9d5171
  2. 28 Jun, 2011 30 commits
  3. 27 Jun, 2011 9 commits