1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 015903294c Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
  rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC
  ape: Use unsigned integer maths
  arm: dsputil: fix overreads in put/avg_pixels functions
  h264: K&R formatting cosmetics for header files (part II/II)
  h264: K&R formatting cosmetics for header files (part I/II)
  rtmp: Implement check bandwidth notification.
  rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player.
  rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin.
  rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream.
  cmdutils: Add fallback case to switch in check_stream_specifier().
  sctp: be consistent with socket option level
  configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags.
  vcr1enc: drop pointless empty encode_init() wrapper function
  vcr1: drop pointless write-only AVCodecContext member from VCR1Context
  vcr1: group encoder code together to save #ifdefs
  vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments
  mov: make one comment slightly more specific
  lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX
  lavfi: move audio-related functions to a separate file.
  lavfi: remove some audio-related function from public API.
  ...

Conflicts:
	cmdutils.c
	libavcodec/h264.h
	libavcodec/h264_mvpred.h
	libavcodec/vcr1.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-10 23:30:42 +02:00
..
ac3dsp_mmx.c
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
cabac.h h264: new assembly version of get_cabac for x86_64 with PIC 2012-04-28 20:02:27 +02:00
cavsdsp_mmx.c
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c dirac: mark some variables const. 2012-03-15 22:12:02 +01:00
diracdsp_mmx.h
diracdsp_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
dsputil_mmx.h Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-04-14 22:37:43 +02:00
dsputilenc_mmx.c dsp: fix diff_bytes_mmx() with small width 2012-03-17 20:48:56 +01:00
dsputilenc_yasm.asm
dwt_yasm.asm
dwt.c
dwt.h
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
h264_chromamc_10bit.asm
h264_chromamc.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-02-28 03:38:58 +01:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
h264_i386.h h264: new assembly version of get_cabac for x86_64 with PIC 2012-04-28 20:02:27 +02:00
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
h264_qpel_10bit.asm x86inc improvements for 64-bit 2012-04-11 15:47:00 -04:00
h264_qpel_mmx.c Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
h264_weight_10bit.asm h264: use proper PROLOGUE statement for a function using 8 registers. 2012-04-16 08:07:21 -07:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
h264dsp_mmx.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx_template.c
mpegvideo_mmx.c
pngdsp-init.c
pngdsp.asm
proresdsp-init.c
proresdsp.asm
rv34dsp_init.c rv34dsp x86: implement MMX2 inverse transform 2012-04-28 10:58:47 -07:00
rv34dsp.asm Merge remote-tracking branch 'qatar/master' 2012-04-29 21:45:54 +02:00
rv40dsp_init.c rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC 2012-05-10 18:42:43 +02:00
rv40dsp.asm Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
sbrdsp_init.c SBR DSP x86: implement SSE sbr_hf_g_filt 2012-02-23 15:50:09 -08:00
sbrdsp.asm dsputil x86: use SSE float instruction instead of SSE2 integer equivalent 2012-04-04 11:24:27 -07:00
simple_idct_mmx.c
snowdsp_mmx.c snowdsp: explicitily state instruction size. 2012-05-02 09:57:12 -07:00
v210-init.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
v210.asm
vc1dsp_mmx.c Fix linking without yasm. 2012-03-24 14:54:06 +01:00
vc1dsp_yasm.asm
vp3dsp.asm
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2012-04-05 22:26:50 +02:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
w64xmmtest.c