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
ac3dsp.asm
cavsdsp_mmx.c
dct32_sse.c
deinterlace.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_yasm.asm
dsputilenc_mmx.c
dsputilenc_yasm.asm
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c
fmtconvert.asm
h264_chromamc.asm
h264_deblock.asm
h264_i386.h
h264_idct.asm
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_mmx.c
h264_weight.asm
h264dsp_mmx.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
lpc_mmx.c
Makefile
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx_template.c Merge remote branch 'qatar/master' 2011-04-30 01:58:26 +02:00
mpegvideo_mmx.c
png_mmx.c Fix add_paeth_prediction_mmx for rgb48 2011-04-27 20:08:37 +02:00
simple_idct_mmx.c
snowdsp_mmx.c
vc1dsp_mmx.c
vc1dsp_yasm.asm
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
x86inc.asm
x86util.asm