Michael Niedermayer 0aa095483d Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487' ...

* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
  avcodec: Add av_cold attributes to init functions missing them

Conflicts:
	libavcodec/aacpsy.c
	libavcodec/atrac3.c
	libavcodec/dvdsubdec.c
	libavcodec/ffv1.c
	libavcodec/ffv1enc.c
	libavcodec/h261enc.c
	libavcodec/h264_parser.c
	libavcodec/h264dsp.c
	libavcodec/h264pred.c
	libavcodec/libschroedingerenc.c
	libavcodec/libxvid_rc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/proresdsp.c
	libavcodec/rangecoder.c
	libavcodec/videodsp.c
	libavcodec/x86/proresdsp_init.c

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

2013-05-05 11:34:29 +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

avcodec/x86/cabac: workaround llvm 4.2.1 bug

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

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

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

dirac: Only use MMX if MMX is available.

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

diracdsp_mmx.h

…

diracdsp_yasm.asm

x86/dirac: fix asm on win64

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

dnxhdenc.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

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

dsputil_mmx.c

Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'

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

dsputil_mmx.h

Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'

2013-05-03 10:50:27 +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

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

Merge remote-tracking branch 'qatar/master'

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

fft_init.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

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

x86/h263_loopfilter: Fix author attribution after code has been moved/splited around

2013-02-19 12:51:00 +01:00

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

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

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

h264_intrapred.asm

…

h264_qpel_8bit.asm

Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'

2013-03-01 13:39:47 +01:00

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 '932806232108872655556100011fe369125805d3'

2013-05-03 10:44:09 +02:00

hpeldsp_rnd_template.c

Merge remote-tracking branch 'qatar/master'

2013-04-26 11:10:57 +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

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

idct_sse2_xvid.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +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 commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd'

2013-05-03 10:36:52 +02:00

mathops.h

…

mlpdsp.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

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

motion_est.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

mpeg4qpel.asm

Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'

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

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

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

mpegvideoenc.c

Merge remote-tracking branch 'qatar/master'

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

pngdsp_init.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

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

pngdsp.asm

…

proresdsp_init.c

Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

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

proresdsp.asm

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

qpel.asm

Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'

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

rnd_template.c

Merge commit '932806232108872655556100011fe369125805d3'

2013-05-03 10:44:09 +02:00

rv34dsp_init.c

Remove unnecessary dsputil.h #includes

2013-02-26 00:51:34 +01:00

rv34dsp.asm

Drop DCTELEM typedef

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

rv40dsp_init.c

Merge commit 'a8b6015823e628047a45916404c00044c5e80415'

2013-03-13 14:18:53 +01:00

rv40dsp.asm

…

sbrdsp_init.c

x86: sbrdsp: Implement SSE2 qmf_deint_bfly

2013-05-03 18:23:14 +02:00

sbrdsp.asm

Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'

2013-05-04 10:07:43 +02:00

simple_idct.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +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

dsputil: convert remaining functions to use ptrdiff_t strides

2013-03-12 18:26:42 +01:00

vc1dsp_mmx.c

Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'

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

vc1dsp.asm

…

vc1dsp.h

…

videodsp_init.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

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

videodsp.asm

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

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

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

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

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

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