Michael Niedermayer fa09ad5c9e Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  x86: dsputil: Fix h263 loop filter link error in some configurations

Conflicts:
	libavcodec/x86/dsputil.asm

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

2013-02-19 12:41:27 +01:00

..

ac3dsp_init.c

…

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

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

dct32.asm

…

deinterlace.asm

…

dirac_dwt.c

…

dirac_dwt.h

…

diracdsp_mmx.c

dirac: Only use MMX if MMX is available.

2013-01-28 20:00:55 +01:00

diracdsp_mmx.h

…

diracdsp_yasm.asm

…

dnxhdenc.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

dsputil_avg_template.c

Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'

2013-02-06 12:18:25 +01:00

dsputil_mmx.c

Merge commit '7a03145ed7cb4f1ce794b5126559dd6f38029243'

2013-02-19 12:32:12 +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 '25841dfe806a13de526ae09c11149ab1f83555a8'

2013-02-06 12:18:25 +01:00

dsputil.asm

Merge remote-tracking branch 'qatar/master'

2013-02-19 12:41:27 +01:00

dsputilenc_mmx.c

Merge remote-tracking branch 'qatar/master'

2013-02-09 14:45:45 +01:00

dsputilenc.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

dwt_yasm.asm

…

fdct.c

Merge remote-tracking branch 'qatar/master'

2013-02-09 14:45:45 +01:00

fft_init.c

…

fft.asm

…

fft.h

…

fmtconvert_init.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

fmtconvert.asm

…

h263_loopfilter.asm

x86: dsputil: Fix h263 loop filter link error in some configurations

2013-02-18 17:09:00 +01:00

h264_chromamc_10bit.asm

…

h264_chromamc.asm

…

h264_deblock_10bit.asm

…

h264_deblock.asm

…

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 '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +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 '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

h264_weight_10bit.asm

…

h264_weight.asm

…

h264chroma_init.c

h264chroma: remove duplicate 9/10 bit functions.

2013-02-11 22:54:52 +01:00

h264dsp_init.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

hpeldsp.asm

Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'

2013-02-06 12:18:25 +01:00

idct_mmx_xvid.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

idct_mmx.c

…

idct_sse2_xvid.c

Merge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf'

2013-01-29 13:48:38 +01:00

idct_xvid.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

imdct36.asm

…

lpc.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2013-02-19 12:41:27 +01:00

mathops.h

…

mlpdsp.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

motion_est.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

mpeg4qpel.asm

Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'

2013-02-12 13:26:22 +01:00

mpegaudiodec.c

Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'

2013-02-09 14:33:57 +01:00

mpegvideo.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

mpegvideoenc_template.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

mpegvideoenc.c

Merge remote-tracking branch 'qatar/master'

2013-02-09 14:45:45 +01:00

pngdsp_init.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

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

rv34: Drop now unnecessary dsputil dependencies

2013-02-06 11:30:54 +01:00

rv34dsp.asm

Drop DCTELEM typedef

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

rv40dsp_init.c

Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'

2013-02-07 13:35:49 +01:00

rv40dsp.asm

…

sbrdsp_init.c

Add av_cold attributes to arch-specific init functions

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

sbrdsp.asm

…

simple_idct.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

snowdsp.c

…

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

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

videodsp.asm

…

vorbisdsp_init.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

vorbisdsp.asm

Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'

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

vp3dsp_init.c

put_vp_no_rnd_pixels8_l2_mmx: fix type

2013-02-03 17:21:06 +01:00

vp3dsp.asm

…

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

…