1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +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
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c
dsputil_mmx.h
dsputil.asm
dsputilenc_mmx.c
dsputilenc.asm
dwt_yasm.asm
dwt.c
dwt.h
fdct_mmx.c
fft_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
fft_mmx.asm
fft.h
fmtconvert_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
fmtconvert.asm
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
h264_i386.h Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
h264_idct_10bit.asm
h264_idct.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight_10bit.asm
h264_weight.asm
h264dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
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-08-15 15:55:24 +02:00
mathops.h
mlpdsp.c Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx_template.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
mpegvideo_mmx.c
pngdsp-init.c
pngdsp.asm
proresdsp-init.c
proresdsp.asm
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c
v210.asm
vc1dsp_mmx.c
vc1dsp.asm
vp3dsp_init.c
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
w64xmmtest.c