1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 580a0600ef Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Move misplaced file author information where it belongs

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavcodec/gif.c
	libavcodec/x86/dsputilenc_mmx.c
	libavcodec/x86/fmtconvert_init.c
	libavformat/au.c
	libavformat/gif.c
	libavformat/mov.c
	libavformat/nsvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 15:56:18 +02:00
..
ac3dsp_init.c Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
ac3dsp.asm
cabac.h
cavsdsp.c Merge commit 'a8b6015823e628047a45916404c00044c5e80415' 2013-03-13 14:18:53 +01: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 remote-tracking branch 'qatar/master' 2013-04-11 12:32:29 +02:00
dsputil_mmx.h dsputil: Make dsputil selectable 2013-04-10 11:04:05 +03:00
dsputil_qns_template.c avcodec/x86/dsputil_qns_template: use av_assert 2013-03-26 04:08:28 +01:00
dsputil_rnd_template.c Move x86 half-pel assembly from dsputil to hpeldsp. 2013-03-13 03:59:23 +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-11 15:56:18 +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
fpelbase.asm Move x86 half-pel assembly from dsputil to hpeldsp. 2013-03-13 03:59:23 +01: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 Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c' 2013-03-01 13:39:47 +01:00
h264_qpel_10bit.asm
h264_qpel.c x86: Change a missed occurrance of int to ptrdiff_t for strides 2013-03-24 12:06:53 +02:00
h264_weight_10bit.asm
h264_weight.asm
h264chroma_init.c
h264dsp_init.c
hpeldsp_avg_template.c Move x86 half-pel assembly from dsputil to hpeldsp. 2013-03-13 03:59:23 +01:00
hpeldsp_init.c Fix compilation with --disable-mmx. 2013-03-22 13:00:50 +01:00
hpeldsp_rnd_template.c Move x86 half-pel assembly from dsputil to hpeldsp. 2013-03-13 03:59:23 +01: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 remote-tracking branch 'qatar/master' 2013-04-11 12:32:29 +02:00
mathops.h
mlpdsp.c
motion_est.c
mpeg4qpel.asm
mpegaudiodec.c
mpegvideo.c x86/mpegvideo: switch to av_assert 2013-03-22 22:57:23 +01:00
mpegvideoenc_template.c
mpegvideoenc.c
pngdsp_init.c
pngdsp.asm
proresdsp_init.c
proresdsp.asm
qpelbase.asm Move x86 half-pel assembly from dsputil to hpeldsp. 2013-03-13 03:59:23 +01:00
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c Merge commit 'a8b6015823e628047a45916404c00044c5e80415' 2013-03-13 14:18:53 +01:00
rv40dsp.asm
sbrdsp_init.c x86: sbrdsp: implement SSE2 qmf_pre_shuffle 2013-04-10 02:42:22 +02:00
sbrdsp.asm x86: sbrdsp: implement SSE2 qmf_pre_shuffle 2013-04-10 02:42:22 +02:00
simple_idct.c
snowdsp.c
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 '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d' 2013-03-27 11:32:45 +01: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/x86: use full transpose for all IDCTs. 2013-03-12 22:54:10 +01:00
vp3dsp.asm vp3: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:55:33 +01: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