• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e1492151
    Michael Niedermayer authored
    * qatar/master:
      png: add missing #if HAVE_SSSE3 around function pointer assignment.
      imdct36: mark SSE functions as using all 16 XMM registers.
      png: move DSP functions to their own DSP context.
      sunrast: Add a sample request for TIFF, IFF, and Experimental Rastfile formats.
      sunrast: Cosmetics
      sunrast: Remove if (unsigned int < 0) check.
      sunrast: Replace magic number by a macro.
    
    Conflicts:
    	libavcodec/dsputil.c
    	libavcodec/dsputil.h
    	libavcodec/pngdec.c
    	libavcodec/sunrast.c
    	libavcodec/x86/Makefile
    	libavcodec/x86/dsputil_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e1492151
Makefile 4.41 KB