1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 9e89bc37ed Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: Add support for SWFVerification
  api-example: use new video encoding API.
  x86: avcodec: Appropriately name files containing only init functions
  mpegvideo_mmx_template: drop some commented-out cruft
  libavresample: add mix level normalization option
  w32pthreads: Add missing #includes to make header compile standalone
  rtmp: Gracefully ignore _checkbw errors by tracking them
  rtmp: Do not send _checkbw calls as notifications
  prores: interlaced ProRes encoding

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/proresenc_kostya.c
	libavcodec/w32pthreads.h
	libavcodec/x86/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-15 15:55:24 +02:00
..
ac3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
ac3dsp.asm
cabac.h Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
cavsdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
dct32_sse.asm
deinterlace.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
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-08-09 19:31:56 +02:00
dsputil_mmx.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
dsputil.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
dsputilenc.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
dwt_yasm.asm
dwt.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
dwt.h
fdct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
fft_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
fft.h
fmtconvert_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_chromamc_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_chromamc.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_deblock.asm
h264_i386.h Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_intrapred_10bit.asm
h264_intrapred_init.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_qpel_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_qpel_mmx.c
h264_weight_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
idct_mmx_xvid.c
idct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
idct_sse2_xvid.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
mathops.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
mlpdsp.c Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
motion_est_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
mpegvideo_mmx_template.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
mpegvideo_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
pngdsp-init.c
pngdsp.asm x86: pngdsp: Fix assembly for OS/2 2012-08-08 15:45:09 +02:00
proresdsp-init.c
proresdsp.asm
rv34dsp_init.c x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h 2012-08-09 00:58:20 +01:00
rv34dsp.asm x86: use 32-bit source registers with movd instruction 2012-08-07 15:21:20 +01:00
rv40dsp_init.c
rv40dsp.asm x86: use 32-bit source registers with movd instruction 2012-08-07 15:21:20 +01:00
sbrdsp_init.c
sbrdsp.asm
simple_idct_mmx.c
snowdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
v210-init.c
v210.asm
vc1dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
vc1dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
vp3dsp_init.c
vp3dsp.asm
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
vp56_arith.h
vp56dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
vp56dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
w64xmmtest.c