Michael Niedermayer 1c60088885 Merge remote-tracking branch 'qatar/master' ... * qatar/master: x86: Only use optimizations with cmov if the CPU supports the instruction x86: Add CPU flag for the i686 cmov instruction x86: remove unused inline asm macros from dsputil_mmx.h x86: move some inline asm macros to the only places they are used lavfi: Add the af_channelmap audio channel mapping filter. lavfi: add join audio filter. lavfi: allow audio filters to request a given number of samples. lavfi: support automatically inserting the fifo filter when needed. lavfi/audio: eliminate ff_default_filter_samples(). Conflicts: Changelog libavcodec/x86/h264dsp_mmx.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/version.h libavutil/x86/cpu.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-06-24 02:09:53 +02:00
..
libvo
cpudetect.h
help_mp.h
img_format.c
img_format.h
mp_image.c
mp_image.h
mp_msg.h
mpbswap.h
mpc_info.h
pullup.c
pullup.h
vd_ffmpeg.h
vf.h
vf_decimate.c
vf_denoise3d.c
vf_detc.c
vf_dint.c
vf_divtc.c
vf_down3dright.c
vf_dsize.c
vf_eq.c
vf_eq2.c
vf_field.c
vf_fil.c
vf_filmdint.c
vf_fixpts.c
vf_framestep.c
vf_fspp.c
vf_geq.c
vf_harddup.c
vf_hqdn3d.c
vf_hue.c
vf_il.c
vf_ilpack.c
vf_ivtc.c
vf_kerndeint.c
vf_mcdeint.c
vf_noise.c
vf_ow.c
vf_palette.c
vf_perspective.c
vf_phase.c
vf_pp.c
vf_pp7.c
vf_pullup.c
vf_qp.c
vf_rectangle.c
vf_rotate.c
vf_sab.c
vf_scale.h
vf_smartblur.c
vf_softpulldown.c
vf_softskip.c
vf_spp.c
vf_stereo3d.c
vf_telecine.c
vf_tile.c
vf_tinterlace.c
vf_unsharp.c
vf_uspp.c
vf_yuvcsp.c
vf_yvu9.c
vfcap.h