1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 612122b187 Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
  10-bit H.264 x86 chroma v loopfilter asm
  Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
  Fix crash of interlaced MPEG2 decoding
  h264pred: fix one more aliasing violation.
  doc/APIchanges: fill in missing hashes and dates.
  flacenc: use proper initializers for AVOption default values.
  lavc: deprecate named constants for deprecated antialias_algo.
  aac: workaround for compilation on cygwin
  swscale: extend YUV422p support to 10bits depth
  tiff: add support for inverted FillOrder for uncompressed data
  Remove unused softfloat implementation.
  h264pred: fix aliasing violations.
  rotozoom: Eliminate French variable name.
  rotozoom: Check return value of fread().
  rotozoom: Return an error value instead of calling exit().
  rotozoom: Make init_demo() return int and check for errors on invocation.
  rotozoom: Drop silly UINT8 typedef.
  rotozoom: Drop some unnecessary parentheses.
  rotozoom: K&R coding style cosmetics
  rtsp: Only do keepalive using GET_PARAMETER if the server supports it
  ...

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	doc/general.texi
	ffmpeg.c
	ffplay.c
	libavcodec/h264pred_template.c
	libavcodec/resample.c
	libavutil/pixfmt.h
	libavutil/softfloat.c
	libavutil/softfloat.h
	tests/rotozoom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-12 04:51:24 +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 Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
dsputil_mmx.h
dsputil_yasm.asm
dsputilenc_mmx.c
dsputilenc_yasm.asm
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
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
fmtconvert.asm
h264_chromamc.asm
h264_deblock_10bit.asm 10-bit H.264 x86 chroma v loopfilter asm 2011-05-11 11:09:10 -07:00
h264_deblock.asm Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
h264_i386.h
h264_idct.asm
h264_intrapred_init.c Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. 2011-05-10 07:24:36 -04:00
h264_intrapred.asm
h264_qpel_mmx.c
h264_weight.asm
h264dsp_mmx.c Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
lpc_mmx.c
Makefile Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
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 Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. 2011-04-26 18:18:22 +02:00
x86util.asm Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00