ffmpeg/libavcodec/x86
Michael Niedermayer 9621646eb3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: dsputil: prettyprint gcc inline asm
  x86: K&R prettyprinting cosmetics for dsputil_mmx.c
  x86: conditionally compile H.264 QPEL optimizations
  dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
  Ignore generated files below doc/.
  dpcm: convert to bytestream2.
  interplayvideo: convert to bytestream2.
  movenc: Merge if statements
  h264: fix memleak in error path.
  pthread: Immediately release all frames in ff_thread_flush()
  h264: Add check for invalid chroma_format_idc
  utvideo: port header reading to bytestream2.

Conflicts:
	.gitignore
	configure
	libavcodec/h264_ps.c
	libavcodec/interplayvideo.c
	libavcodec/pthread.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-25 23:10:30 +02:00
..
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +02:00
ac3dsp.asm
ac3dsp_mmx.c
cabac.h
cavsdsp_mmx.c
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +02:00
dsputil_mmx.h
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_yasm.asm
dsputilenc_mmx.c
dsputilenc_yasm.asm
dwt.c
dwt.h
dwt_yasm.asm
fdct_mmx.c
fft.c
fft.h
fft_3dn.c
fft_3dn2.c
fft_mmx.asm
fft_sse.c
fmtconvert.asm
fmtconvert_mmx.c
h264_chromamc.asm
h264_chromamc_10bit.asm
h264_deblock.asm
h264_deblock_10bit.asm
h264_i386.h
h264_idct.asm
h264_idct_10bit.asm
h264_intrapred.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight.asm
h264_weight_10bit.asm
h264dsp_mmx.c
idct_mmx.c
idct_mmx_xvid.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx.c
mpegvideo_mmx_template.c
pngdsp-init.c
pngdsp.asm
proresdsp-init.c
proresdsp.asm
rv34dsp.asm
rv34dsp_init.c
rv40dsp.asm
rv40dsp_init.c
sbrdsp.asm Merge remote-tracking branch 'qatar/master' 2012-03-24 10:59:43 +01:00
sbrdsp_init.c
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c
v210.asm
vc1dsp_mmx.c Fix linking without yasm. 2012-03-24 14:54:06 +01:00
vc1dsp_yasm.asm
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp.asm
vp56dsp_init.c
w64xmmtest.c