Michael Niedermayer a85311ef84 Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca' ...

* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
  videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
  dsputil: drop non-compliant "fast" qpel mc functions
  get_bits: change the failure condition in init_get_bits

Conflicts:
	libavcodec/get_bits.h

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

2013-01-21 13:38:57 +01:00

..

ac3dsp_init.c

x86/ac3dsp_init: try to workaround ICC failure.

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

ac3dsp.asm

Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'

2013-01-15 15:23:20 +01:00

cabac.h

…

cavsdsp.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

dct32.asm

build: Drop AVX assembly ifdefs

2012-11-11 20:43:28 +01:00

deinterlace.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

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

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

diracdsp_mmx.h

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

diracdsp_yasm.asm

x86/dirac: fix asm on win64

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

dnxhdenc.c

…

dsputil_avg_template.c

Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'

2013-01-21 13:38:57 +01:00

dsputil_mmx.c

Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'

2013-01-21 13:38:57 +01:00

dsputil_mmx.h

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

dsputil_qns_template.c

…

dsputil_rnd_template.c

…

dsputil.asm

Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'

2012-12-21 17:18:43 +01:00

dsputilenc_mmx.c

dsputil_mmx: switch to av_assert2()

2012-12-10 14:41:31 +01:00

dsputilenc.asm

Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'

2013-01-15 15:23:20 +01:00

dwt_yasm.asm

x86/dirac: fix asm on win64

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

fdct.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

fft_init.c

…

fft.asm

build: Drop AVX assembly ifdefs

2012-11-11 20:43:28 +01:00

fft.h

…

fmtconvert_init.c

…

fmtconvert.asm

Merge remote-tracking branch 'qatar/master'

2012-11-19 14:24:20 +01:00

h264_chromamc_10bit.asm

Merge remote-tracking branch 'qatar/master'

2012-11-14 12:34:30 +01:00

h264_chromamc.asm

Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'

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

h264_deblock_10bit.asm

Merge remote-tracking branch 'qatar/master'

2012-11-14 12:34:30 +01:00

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

Merge remote-tracking branch 'qatar/master'

2012-11-14 12:34:30 +01:00

h264_idct.asm

Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'

2012-11-28 13:32:17 +01:00

h264_intrapred_10bit.asm

Merge remote-tracking branch 'qatar/master'

2012-11-14 12:34:30 +01:00

h264_intrapred_init.c

Merge remote-tracking branch 'qatar/master'

2012-11-14 12:34:30 +01:00

h264_intrapred.asm

Merge remote-tracking branch 'qatar/master'

2012-11-19 14:24:20 +01:00

h264_qpel_8bit.asm

Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c'

2012-11-26 14:24:19 +01:00

h264_qpel_10bit.asm

x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros

2012-11-10 14:49:09 +01:00

h264_qpel.c

Merge remote-tracking branch 'qatar/master'

2012-11-26 02:17:02 +01:00

h264_weight_10bit.asm

x86: h264_weight_10bit: port to cpuflags

2012-11-13 19:07:09 +01:00

h264_weight.asm

Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

2012-11-28 13:27:18 +01:00

h264dsp_init.c

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

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

idct_mmx_xvid.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

idct_mmx.c

…

idct_sse2_xvid.c

…

idct_xvid.h

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

imdct36.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

lpc.c

…

Makefile

Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'

2013-01-20 14:13:16 +01:00

mathops.h

…

mlpdsp.c

Merge remote-tracking branch 'qatar/master'

2012-10-11 15:55:41 +02:00

motion_est.c

Drop Snow codec

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

mpegaudiodec.c

…

mpegvideo.c

libavcodec/x86/mpegvideo: switch to av_assert2

2012-12-10 23:30:16 +01:00

mpegvideoenc_template.c

x86/mpegvideoenc_template: use av_assert

2012-11-23 17:57:22 +01:00

mpegvideoenc.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

pngdsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-11-14 12:34:30 +01:00

pngdsp.asm

x86: mmx2 ---> mmxext in asm constructs

2012-11-14 00:58:51 +01:00

proresdsp_init.c

…

proresdsp.asm

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

rv34dsp_init.c

x86: mmx2 ---> mmxext in asm constructs

2012-11-14 00:58:51 +01:00

rv34dsp.asm

x86: mmx2 ---> mmxext in asm constructs

2012-11-14 00:58:51 +01:00

rv40dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-11-14 12:34:30 +01:00

rv40dsp.asm

x86: mmx2 ---> mmxext in asm constructs

2012-11-14 00:58:51 +01:00

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

…

snowdsp.c

lavc: split snow and dirac DWTs

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

v210-init.c

…

v210.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

vc1dsp_init.c

x86: mmx2 ---> mmxext in asm constructs

2012-11-14 00:58:51 +01:00

vc1dsp_mmx.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

vc1dsp.asm

Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'

2012-11-05 22:36:05 +01:00

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 'fef906c77c09940a2fdad155b2adc05080e17eda'

2013-01-20 14:13:16 +01:00

vp3dsp_init.c

Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'

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

vp3dsp.asm

Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'

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

vp8dsp_init.c

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

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

vp8dsp.asm

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

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

vp56_arith.h

…

vp56dsp_init.c

…

vp56dsp.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

w64xmmtest.c

…