• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 1c600888
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1c600888
cpu.c 9.45 KB