Michael Niedermayer bb2f4ae434 Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' ...

* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
  dsputil: Fix error by not using redzone and register name
  swscale: GBRP output support

Conflicts:
	libswscale/output.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-01-28 14:11:31 +01:00

..

ac3dsp_init.c

x86/ac3dsp_init: try to workaround ICC failure.

2012-12-23 19:27:19 +01:00

ac3dsp.asm

x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly

2013-01-21 23:54:32 +01:00

cabac.h

avcodec/x86/cabac: workaround llvm 4.2.1 bug

2013-01-22 03:43:29 +01:00

cavsdsp.c

…

dct32.asm

…

deinterlace.asm

…

dirac_dwt.c

lavc: split snow and dirac DWTs

2013-01-14 22:59:05 +01:00

dirac_dwt.h

lavc: split snow and dirac DWTs

2013-01-14 22:59:05 +01:00

diracdsp_mmx.c

…

diracdsp_mmx.h

…

diracdsp_yasm.asm

x86/dirac: fix asm on win64

2013-01-14 23:28:01 +01:00

dnxhdenc.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_avg_template.c

Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'

2013-01-27 14:24:28 +01:00

dsputil_mmx.c

dsputil: add missing HAVE_YASM guard

2013-01-27 15:20:35 +01:00

dsputil_mmx.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_qns_template.c

…

dsputil_rnd_template.c

Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'

2013-01-23 17:52:21 +01:00

dsputil.asm

Merge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568'

2013-01-27 13:32:56 +01:00

dsputilenc_mmx.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputilenc.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dwt_yasm.asm

x86/dirac: fix asm on win64

2013-01-14 23:28:01 +01:00

fdct.c

…

fft_init.c

…

fft.asm

…

fft.h

…

fmtconvert_init.c

…

fmtconvert.asm

…

h264_chromamc_10bit.asm

…

h264_chromamc.asm

Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'

2013-01-16 11:44:45 +01:00

h264_deblock_10bit.asm

…

h264_deblock.asm

x86inc: support stack mem allocation and re-alignment in PROLOGUE.

2012-12-12 10:37:52 +01:00

h264_i386.h

…

h264_idct_10bit.asm

…

h264_idct.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

h264_intrapred_10bit.asm

…

h264_intrapred_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

h264_intrapred.asm

…

h264_qpel_8bit.asm

Merge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568'

2013-01-27 13:32:56 +01:00

h264_qpel_10bit.asm

…

h264_qpel.c

Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'

2013-01-26 14:33:06 +01:00

h264_weight_10bit.asm

…

h264_weight.asm

…

h264dsp_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

hpeldsp.asm

Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

2013-01-28 14:11:31 +01:00

idct_mmx_xvid.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

idct_mmx.c

…

idct_sse2_xvid.c

…

idct_xvid.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

imdct36.asm

…

lpc.c

…

Makefile

Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'

2013-01-27 14:24:28 +01:00

mathops.h

…

mlpdsp.c

…

motion_est.c

Drop Snow codec

2013-01-06 16:30:02 +01:00

mpeg4qpel.asm

Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

2013-01-28 14:11:31 +01:00

mpegaudiodec.c

…

mpegvideo.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

mpegvideoenc_template.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

mpegvideoenc.c

…

pngdsp_init.c

…

pngdsp.asm

…

proresdsp_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

proresdsp.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

rv34dsp_init.c

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

rv34dsp.asm

Drop DCTELEM typedef

2013-01-22 18:32:56 -08:00

rv40dsp_init.c

…

rv40dsp.asm

…

sbrdsp_init.c

x86: sbrdsp: Implement SSE qmf_post_shuffle

2013-01-06 13:57:01 +01:00

sbrdsp.asm

Merge commit '4f50646697606df39317b93c2a427603b77636ee'

2013-01-07 01:51:10 +01:00

simple_idct.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

snowdsp.c

lavc: split snow and dirac DWTs

2013-01-14 22:59:05 +01:00

v210-init.c

…

v210.asm

…

vc1dsp_init.c

…

vc1dsp_mmx.c

Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'

2013-01-27 14:24:28 +01:00

vc1dsp.asm

…

vc1dsp.h

…

videodsp_init.c

videodsp: Fix project name

2012-12-22 00:58:08 +01:00

videodsp.asm

videodsp: Fix project name

2012-12-22 00:58:08 +01:00

vorbisdsp_init.c

Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'

2013-01-23 17:00:26 +01:00

vorbisdsp.asm

Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'

2013-01-23 17:00:26 +01:00

vp3dsp_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp3dsp.asm

Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'

2013-01-20 13:57:10 +01:00

vp8dsp_init.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp8dsp.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp56_arith.h

…

vp56dsp_init.c

…

vp56dsp.asm

…

w64xmmtest.c

…