1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer e847f41285 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libspeexenc: add supported sample rates and channel layouts.
  Replace usleep() calls with av_usleep()
  lavu: add av_usleep() function
  utvideo: mark interlaced frames as such
  utvideo: Fix interlaced prediction for RGB utvideo.
  cosmetics: do not use full path for local headers
  lavu/file: include unistd.h only when available
  configure: check for unistd.h
  log: include unistd.h only when needed
  lavf: include libavutil/time.h instead of redeclaring av_gettime()

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavcodec/utvideo.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-22 22:34:02 +02:00
..
ac3dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
cabac.h
cavsdsp_mmx.c
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm diracdsp: try to fix segfault 2012-06-16 23:16:54 +02:00
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c x86/dsputil_mmx: support 4 sample edges 2012-06-22 17:23:09 +02:00
dsputil_mmx.h
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputilenc_mmx.c
dsputilenc_yasm.asm
dwt_yasm.asm
dwt.c libavcodec/x86/dwt.c: move some missed things under HAVE_YASM 2012-06-10 03:20:27 +02:00
dwt.h
fdct_mmx.c
fft_3dn2.c x86: use new schema for ASM macros 2012-05-29 14:49:45 +02:00
fft_3dn.c
fft_mmx.asm Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
fft_sse.c
fft.c x86: use new schema for ASM macros 2012-05-29 14:49:45 +02:00
fft.h x86: use new schema for ASM macros 2012-05-29 14:49:45 +02:00
fmtconvert_mmx.c
fmtconvert.asm
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
h264_i386.h
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 Fix compilation with --disable-everything. 2012-05-24 08:08:31 +02:00
h264_weight_10bit.asm
h264_weight.asm
h264dsp_mmx.c libavcodec/x86/h264dsp_mmx.c: add forgotten HAVE_YASM 2012-06-10 03:23:44 +02:00
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c
Makefile
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.asm
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
rv40dsp.asm Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
sbrdsp_init.c
sbrdsp.asm
simple_idct_mmx.c
snowdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-18 20:07:00 +02:00
v210-init.c
v210.asm
vc1dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-05-13 00:13:49 +02:00
vc1dsp_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-05-13 00:13:49 +02:00
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
w64xmmtest.c