Michael Niedermayer 69d2eff5af Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d' ...

* commit '63bac48f734fc69cca2ef2cfada92cd9a222734d':
  x86: dsputil: Move rv40-specific functions where they belong

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_mmx.h

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

2013-05-08 14:08:00 +02:00

..

ac3dsp_init.c

Merge remote-tracking branch 'qatar/master'

2013-04-27 11:35:03 +02:00

ac3dsp.asm

Merge remote-tracking branch 'qatar/master'

2013-04-27 11:35:03 +02:00

cabac.h

…

cavsdsp.c

Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'

2013-05-03 10:50:27 +02:00

constants.c

Merge remote-tracking branch 'qatar/master'

2013-04-11 12:32:29 +02:00

dct32.asm

…

deinterlace.asm

…

dirac_dwt.c

…

dirac_dwt.h

…

diracdsp_mmx.c

…

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc.c

…

dsputil_mmx.c

Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'

2013-05-08 14:08:00 +02:00

dsputil_mmx.h

Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'

2013-05-08 14:08:00 +02:00

dsputil_qns_template.c

avcodec/x86/dsputil_qns_template: use av_assert

2013-03-26 04:08:28 +01:00

dsputil.asm

x86: qpel: Move fullpel and l2 functions to a separate file

2013-04-08 12:38:33 +03:00

dsputilenc_mmx.c

Merge remote-tracking branch 'qatar/master'

2013-04-23 11:01:46 +02:00

dsputilenc.asm

…

dwt_yasm.asm

…

fdct.c

…

fft_init.c

…

fft.asm

…

fft.h

…

fmtconvert_init.c

Merge remote-tracking branch 'qatar/master'

2013-04-11 15:56:18 +02:00

fmtconvert.asm

…

fpel_mmx.c

Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

2013-05-04 10:17:52 +02:00

fpel.asm

Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'

2013-04-20 13:42:51 +02:00

h263_loopfilter.asm

…

h264_chromamc_10bit.asm

…

h264_chromamc.asm

dsputil: Make dsputil selectable

2013-04-10 11:04:05 +03:00

h264_deblock_10bit.asm

…

h264_deblock.asm

dsputil: Make dsputil selectable

2013-04-10 11:04:05 +03:00

h264_i386.h

…

h264_idct_10bit.asm

h264: Integrate clear_blocks calls with IDCT

2013-04-10 11:03:06 +03:00

h264_idct.asm

Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'

2013-04-11 11:53:19 +02:00

h264_intrapred_10bit.asm

…

h264_intrapred_init.c

…

h264_intrapred.asm

…

h264_qpel_8bit.asm

…

h264_qpel_10bit.asm

…

h264_qpel.c

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

h264_weight_10bit.asm

…

h264_weight.asm

…

h264chroma_init.c

Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

2013-05-05 11:34:29 +02:00

h264dsp_init.c

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

hpeldsp_avg_template.c

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

hpeldsp_init.c

Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

2013-05-08 14:01:58 +02:00

hpeldsp_mmx.c

Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'

2013-05-06 21:00:40 +02:00

hpeldsp_rnd_template.c

Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

2013-05-08 14:01:58 +02:00

hpeldsp.asm

x86: qpel: Move fullpel and l2 functions to a separate file

2013-04-08 12:38:33 +03:00

idct_mmx_xvid.c

…

idct_sse2_xvid.c

…

idct_xvid.h

…

imdct36.asm

…

lpc.c

…

Makefile

Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

2013-05-08 14:01:58 +02:00

mathops.h

…

mlpdsp.c

…

motion_est.c

…

mpeg4qpel.asm

…

mpegaudiodsp.c

Merge commit '6b110d3a739c31602b59887ad65c67025df3f49d'

2013-05-01 17:53:33 +02:00

mpegvideo.c

x86/mpegvideo: switch to av_assert

2013-03-22 22:57:23 +01:00

mpegvideoenc_template.c

…

mpegvideoenc.c

Merge remote-tracking branch 'qatar/master'

2013-04-23 11:01:46 +02:00

pngdsp_init.c

…

pngdsp.asm

…

proresdsp_init.c

Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

2013-05-05 11:34:29 +02:00

proresdsp.asm

…

qpel.asm

Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'

2013-04-20 13:42:51 +02:00

rnd_mmx.c

Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

2013-05-08 14:01:58 +02:00

rnd_template.c

Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

2013-05-08 14:01:58 +02:00

rv34dsp_init.c

…

rv34dsp.asm

…

rv40dsp_init.c

Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'

2013-05-08 14:08:00 +02:00

rv40dsp.asm

…

sbrdsp_init.c

x86: sbrdsp: force PIC addressing for Win64

2013-05-08 03:07:03 +02:00

sbrdsp.asm

x86: sbrdsp: force PIC addressing for Win64

2013-05-08 03:07:03 +02:00

simple_idct.c

…

snowdsp.c

…

v210-init.c

…

v210.asm

…

vc1dsp_init.c

…

vc1dsp_mmx.c

Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'

2013-05-03 10:50:27 +02:00

vc1dsp.asm

…

vc1dsp.h

…

videodsp_init.c

…

videodsp.asm

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

2013-03-28 11:20:41 +01:00

vorbisdsp_init.c

…

vorbisdsp.asm

…

vp3dsp_init.c

vp3: Use full transpose for all IDCTs

2013-04-15 12:32:05 +03:00

vp3dsp.asm

Merge commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3'

2013-04-16 00:44:20 +02:00

vp8dsp_init.c

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

2013-03-28 11:20:41 +01:00

vp8dsp.asm

dsputil: Make dsputil selectable

2013-04-10 11:04:05 +03:00

vp56_arith.h

…

vp56dsp_init.c

…

vp56dsp.asm

…

w64xmmtest.c

x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function

2013-03-23 23:37:27 +02:00