Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Jan 2012 04:20:58 +0000 (05:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Jan 2012 04:20:58 +0000 (05:20 +0100)
commite1492151fb0c1ad2a9efbb2f2413b60113208b61
treee4852fd092e2b2346c21e87d8b69987b2b4c2a68
parent90bf7c7b41c9e78663ef3da00480f70854072932
parent20a7d3178f2370ebd1f548c144bc90d1e1bcd81a
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/png.h
libavcodec/pngdec.c
libavcodec/pngdsp.c
libavcodec/sunrast.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/imdct36_sse.asm
libavcodec/x86/pngdsp-init.c