Michael Niedermayer 244682dd08 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  log: Only include unistd.h if configure found it
  ape: create audio stream before reading tags.
  mov: make a length variable larger.
  image2: Add "start_number" private option to the demuxer
  image2: Add "start_number" private option to the muxer
  avconv: remove a forgotten debugging printf.
  avconv: use more descriptive names for hardcoded filters.
  avconv: remove redundant handling of async.
  doc/filters: fix typo.
  h264: use asm cabac reader under a generic condition

Conflicts:
	ffmpeg.c
	libavformat/img2dec.c
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-06-24 21:34:54 +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

h264: new assembly version of get_cabac for x86_64 with PIC

2012-04-28 20:02:27 +02:00

cavsdsp_mmx.c

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +02:00

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

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +02:00

dsputil_mmx.h

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +02:00

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

Merge remote-tracking branch 'qatar/master'

2012-06-24 21:34:54 +02:00

h264_idct_10bit.asm

…

h264_idct.asm

…

h264_intrapred_10bit.asm

…

h264_intrapred_init.c

x86: Only use optimizations with cmov if the CPU supports the instruction

2012-06-23 16:21:50 +02:00

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: use proper PROLOGUE statement for a function using 8 registers.

2012-04-16 08:07:21 -07:00

h264_weight.asm

…

h264dsp_mmx.c

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +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 x86: implement MMX2 inverse transform

2012-04-28 10:58:47 -07:00

rv34dsp.asm

Merge remote-tracking branch 'qatar/master'

2012-04-29 21:45:54 +02:00

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

…