1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer be315a3232 Merge remote branch 'qatar/master'
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-30 01:58:26 +02:00
..
ac3dsp_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ac3dsp.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
cavsdsp_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dct32_sse.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
deinterlace.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dnxhd_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_mmx_avg_template.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_mmx_qns_template.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_mmx_rnd_template.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_mmx.c Move png mmx functions into x86/png_mmx.c, remove them from DSPContext. 2011-04-27 20:08:09 +02:00
dsputil_mmx.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputil_yasm.asm Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
dsputilenc_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dsputilenc_yasm.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fdct_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fft_3dn2.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fft_3dn.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fft_mmx.asm Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
fft_sse.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
fft.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
fft.h Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
fmtconvert_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fmtconvert.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264_chromamc.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264_deblock.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264_i386.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264_idct.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264_intrapred_init.c Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. 2011-04-10 22:33:42 +02:00
h264_intrapred.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264_qpel_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264_weight.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
h264dsp_mmx.c Fix compilation with --disable-yasm. 2011-04-12 17:40:18 +02:00
idct_mmx_xvid.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
idct_mmx.c
idct_sse2_xvid.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
idct_xvid.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lpc_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
Makefile Move png mmx functions into x86/png_mmx.c, remove them from DSPContext. 2011-04-27 20:08:09 +02:00
mathops.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mlpdsp.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
motion_est_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegaudiodec_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mpegvideo_mmx_template.c Merge remote branch 'qatar/master' 2011-04-30 01:58:26 +02:00
mpegvideo_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
png_mmx.c Fix add_paeth_prediction_mmx for rgb48 2011-04-27 20:08:37 +02:00
simple_idct_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
snowdsp_mmx.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vc1dsp_mmx.c dsputil: move VC1-specific stuff into VC1DSPContext. 2011-02-17 17:35:35 -05:00
vc1dsp_yasm.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp3dsp.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp8dsp-init.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp8dsp.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp56_arith.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp56dsp_init.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vp56dsp.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86inc.asm Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. 2011-04-26 18:18:22 +02:00
x86util.asm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00