1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
Michael Niedermayer e1492151fb 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>
2012-01-30 05:20:58 +01:00
..
2012-01-28 21:20:42 +01:00
2012-01-17 20:16:35 +01:00
2012-01-28 21:59:01 +01:00
2012-01-26 17:05:57 +01:00
2012-01-19 17:12:43 +01:00
2012-01-26 17:05:57 +01:00
2012-01-17 20:16:35 +01:00
2012-01-29 21:52:55 +01:00
2012-01-26 19:54:38 +01:00
2012-01-25 18:55:32 +01:00
2012-01-26 17:30:49 +01:00
2012-01-28 23:21:03 +01:00
2012-01-28 22:08:20 +01:00
2012-01-28 22:08:20 +01:00
2012-01-28 22:08:20 +01:00
2012-01-23 19:47:49 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2012-01-28 11:04:19 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2012-01-22 04:49:46 +01:00
2012-01-28 22:08:21 +01:00
2012-01-16 19:21:24 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00