1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer de17ccc774 Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'
* commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2':
  x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.

Conflicts:
	libavcodec/x86/videodsp_init.c

See: 1b3a7e1f42
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:30:30 +01:00
..
ac3dsp_init.c Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b' 2014-01-09 20:24:15 +01:00
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2013-04-27 11:35:03 +02:00
cabac.h avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0 2013-10-31 11:13:27 +01:00
cavsdsp.c Merge remote-tracking branch 'qatar/master' 2013-12-05 11:55:41 +01:00
constants.c Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57' 2013-05-09 11:36:29 +02:00
constants.h Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57' 2013-05-09 11:36:29 +02:00
dct32.asm
dct_init.c Merge remote-tracking branch 'qatar/master' 2013-08-22 14:28:42 +02:00
deinterlace.asm
dirac_dwt.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
dirac_dwt.h
diracdsp_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.c Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0' 2013-08-30 12:08:28 +02:00
dsputil_init.c Move add/diff_int16 to lossless_videodsp 2014-01-20 21:32:47 +01:00
dsputil_mmx.c Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0' 2013-11-15 15:07:10 +01:00
dsputil_qns_template.c avcodec/x86/dsputil_qns_template: use av_assert 2013-03-26 04:08:28 +01:00
dsputil_x86.c Merge commit '2ddb35b91131115c094d90e04031451023441b4d' 2013-10-06 11:50:01 +02:00
dsputil_x86.h Move add/diff_int16 to lossless_videodsp 2014-01-20 21:32:47 +01:00
dsputil.asm Move add/diff_int16 to lossless_videodsp 2014-01-20 21:32:47 +01:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2013-12-05 11:55:41 +01:00
dsputilenc.asm
dwt_yasm.asm
fdct.c Merge remote-tracking branch 'qatar/master' 2013-10-07 11:37:47 +02:00
fft_init.c Merge remote-tracking branch 'qatar/master' 2013-08-22 14:28:42 +02:00
fft.asm x86: Fix compilation with nasm on PPC & OS/2 2013-10-08 12:36:19 +02:00
fft.h Merge remote-tracking branch 'qatar/master' 2013-08-22 14:28:42 +02:00
fmtconvert_init.c Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4' 2013-08-30 12:50:01 +02:00
fmtconvert.asm fmtconvert: Explicitly use int32_t instead of int 2013-07-17 11:02:47 +03:00
fpel_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +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
h263dsp_init.c Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6' 2013-11-08 17:42:56 +01:00
h264_chromamc_10bit.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
h264_chromamc.asm dsputil: Make dsputil selectable 2013-04-10 11:04:05 +03:00
h264_deblock_10bit.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
h264_deblock.asm Merge commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450' 2013-10-08 11:23:00 +02:00
h264_i386.h
h264_idct_10bit.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2013-10-08 12:10:02 +02:00
h264_intrapred_10bit.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
h264_intrapred_init.c Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb' 2014-01-06 16:51:23 +01:00
h264_intrapred.asm avcodec/x86: remove 3 sub in pred4x4_tm_vp8_8. 2013-11-17 23:12:35 +01:00
h264_qpel_8bit.asm Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c' 2013-03-01 13:39:47 +01:00
h264_qpel_10bit.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
h264_qpel.c Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
h264_weight_10bit.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
h264_weight.asm
h264chroma_init.c Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
h264dsp_init.c Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb' 2014-01-06 16:51:23 +01:00
hpeldsp_init.c Merge commit '4c642d8d98703faf52983243098f35865e15b312' 2014-01-09 20:32:53 +01:00
hpeldsp_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
hpeldsp_rnd_template.c Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be' 2013-05-14 10:18:46 +02:00
hpeldsp.asm x86: hpeldsp: Use PAVGB instruction macro where necessary 2013-11-04 01:29:23 +01:00
idct_mmx_xvid.c Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918' 2013-10-06 11:25:22 +02:00
idct_sse2_xvid.c Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918' 2013-10-06 11:25:22 +02:00
idct_xvid.h
imdct36.asm
lossless_videodsp_init.c avcodec/x86/lossless_videodsp: disable median optimizations for 16bps 2014-01-23 01:51:24 +01:00
lossless_videodsp.asm x86/lossless_videodsp: silly one-line cosmetic. 2014-01-25 16:24:50 +01:00
lpc.c avcodec/x86/lpc: Fix cpu flag checks so they work 2013-08-30 12:34:52 +02:00
Makefile Move add/diff_int16 to lossless_videodsp 2014-01-20 21:32:47 +01:00
mathops.h mathops/x86: work around inline asm miscompilation with GCC 4.8.1 2013-09-15 11:15:07 -04:00
mlpdsp.c Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c' 2013-07-12 13:10:53 +02:00
motion_est.c Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0' 2013-08-30 12:08:28 +02:00
mpeg4qpel.asm Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b' 2013-02-12 13:26:22 +01:00
mpegaudiodsp.c Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7' 2014-01-14 14:44:59 +01:00
mpegvideo.c Merge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b' 2013-12-20 23:44:31 +01:00
mpegvideoenc_template.c Merge remote-tracking branch 'qatar/master' 2013-12-02 10:59:48 +01:00
mpegvideoenc.c Merge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b' 2013-12-20 23:44:31 +01:00
pngdsp_init.c Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
pngdsp.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
proresdsp_init.c avcodec/x86/proresdsp_init: x86 prores IDCT is bitexact again 2014-01-14 15:59:00 +01:00
proresdsp.asm
qpel.asm Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197' 2013-04-20 13:42:51 +02:00
rnd_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
rnd_template.c Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be' 2013-05-14 10:18:46 +02:00
rv34dsp_init.c Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b' 2014-01-09 20:24:15 +01:00
rv34dsp.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
rv40dsp_init.c Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4' 2013-08-30 12:50:01 +02:00
rv40dsp.asm Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930' 2013-11-05 10:26:07 +01:00
sbrdsp_init.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
sbrdsp.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
simple_idct.c x86/simple_idct: use LOCAL_ALIGNED instead of DECLARE_ALIGNED 2013-09-03 17:02:49 +00:00
snowdsp.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
v210-init.c
v210.asm Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
vc1dsp_init.c x86: avcodec: Add a bunch of missing #includes for av_cold 2014-01-09 15:09:07 +01:00
vc1dsp_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
vc1dsp.asm
vc1dsp.h
videodsp_init.c Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2' 2014-01-31 14:30:30 +01:00
videodsp.asm x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such. 2014-01-30 15:30:01 +01:00
vorbisdsp_init.c Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0' 2013-08-30 12:08:28 +02:00
vorbisdsp.asm
vp3dsp_init.c Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
vp3dsp.asm Merge commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3' 2013-04-16 00:44:20 +02:00
vp6dsp_init.c Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b' 2014-01-09 20:24:15 +01:00
vp6dsp.asm Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9' 2013-08-24 11:04:11 +02:00
vp8dsp_init.c Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b' 2014-01-09 20:24:15 +01:00
vp8dsp_loopfilter.asm Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839' 2013-11-02 10:13:14 +01:00
vp8dsp.asm Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839' 2013-11-02 10:13:14 +01:00
vp9dsp_init.c x86/vp9lpf: add ff_vp9_loop_filter_h_{48,84}_16_{sse2,ssse3,avx}(). 2014-01-30 19:34:13 +01:00
vp9itxfm.asm vp9/x86: use explicit register for relative stack references. 2014-01-24 19:25:25 -05:00
vp9lpf.asm x86/vp9lpf: add ff_vp9_loop_filter_h_{48,84}_16_{sse2,ssse3,avx}(). 2014-01-30 19:34:13 +01:00
vp9mc.asm vp9/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext 2014-01-18 17:08:25 +01:00
vp56_arith.h
w64xmmtest.c x86: Add an xmm clobbering wrapper for avcodec_encode_video2 2013-09-17 10:53:23 +02:00