Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Jun 2012 00:09:53 +0000 (02:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Jun 2012 00:09:53 +0000 (02:09 +0200)
commit1c600888857544986d6576bc164e0dc8f0f4b6c7
treef4e77c53d1050223a9170f75e4ea719f29cd04eb
parentda728d5d2e7993911c7ed92c212ab900b7be180c
parentfe07c9c6b5a870b8f2ffcfac649228b4d76e9505
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>
43 files changed:
Changelog
doc/APIchanges
doc/filters.texi
libavcodec/x86/cavsdsp_mmx.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
libavcodec/x86/h264dsp_mmx.c
libavfilter/Makefile
libavfilter/af_aconvert.c
libavfilter/af_aformat.c
libavfilter/af_amerge.c
libavfilter/af_anull.c
libavfilter/af_aresample.c
libavfilter/af_asetnsamples.c
libavfilter/af_astreamsync.c
libavfilter/af_atempo.c
libavfilter/af_channelmap.c
libavfilter/af_pan.c
libavfilter/allfilters.c
libavfilter/audio.c
libavfilter/audio.h
libavfilter/avf_showwaves.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/buffersink.c
libavfilter/defaults.c
libavfilter/fifo.c
libavfilter/formats.c
libavfilter/internal.h
libavfilter/libmpcodecs/vf_uspp.c
libavfilter/sink_buffer.c
libavfilter/version.h
libavfilter/vf_blackdetect.c
libavfilter/vf_idet.c
libavfilter/vf_mp.c
libavfilter/vf_thumbnail.c
libavfilter/vf_tile.c
libavfilter/vf_tinterlace.c
libavfilter/video.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c