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
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-22 23:11:43 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-05-16 13:16:05 +02:00
2012-06-24 02:09:53 +02:00
2012-06-22 23:11:43 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-22 23:11:43 +02:00
2012-06-16 15:15:16 +00:00
2012-06-22 21:26:18 +02:00
2012-06-24 02:09:53 +02:00
2012-06-15 19:10:58 +02:00
2012-06-22 23:11:43 +02:00
2012-06-16 15:15:16 +00:00
2012-05-18 23:34:11 +02:00
2012-06-24 02:09:53 +02:00
2012-06-13 22:43:57 +02:00
2012-05-06 16:18:10 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-19 16:44:36 +02:00
2012-05-10 02:25:41 +02:00
2012-06-24 02:09:53 +02:00
2012-06-23 11:34:46 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-13 10:51:33 +02:00
2012-05-31 17:27:27 +02:00
2012-06-24 02:09:53 +02:00
2012-06-09 08:42:50 +02:00
2012-06-23 00:42:51 +02:00
2012-05-19 10:59:52 +02:00
2012-06-24 02:09:53 +02:00
2012-06-16 15:15:16 +00:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-13 22:43:57 +02:00
2012-05-16 13:16:05 +02:00
2012-06-13 22:43:57 +02:00
2012-06-24 02:09:53 +02:00
2012-05-26 20:45:59 +02:00
2012-05-25 18:54:01 +02:00
2012-05-26 20:46:00 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-20 12:37:50 +02:00
2012-05-19 10:59:52 +02:00
2012-06-22 23:11:43 +02:00
2012-06-20 23:55:17 +02:00
2012-05-18 23:34:11 +02:00
2012-06-24 02:09:53 +02:00
2012-06-13 22:43:57 +02:00
2012-06-22 23:11:43 +02:00
2012-06-16 15:15:16 +00:00
2012-06-24 02:09:53 +02:00
2012-06-13 22:43:57 +02:00
2012-06-13 22:43:57 +02:00
2012-06-16 15:15:16 +00:00
2012-06-13 22:43:57 +02:00
2012-06-13 22:43:57 +02:00
2012-06-13 22:43:57 +02:00
2012-06-22 23:11:43 +02:00
2012-06-21 17:01:44 +02:00
2012-06-13 22:43:57 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
2012-06-13 22:43:57 +02:00
2012-06-13 22:43:57 +02:00
2012-06-22 23:11:43 +02:00
2012-06-20 20:36:12 +00:00
2012-06-13 22:43:57 +02:00
2012-06-16 15:15:16 +00:00
2012-06-13 22:43:57 +02:00
2012-06-24 02:09:53 +02:00
2012-06-10 08:02:02 +02:00
2012-06-22 23:11:43 +02:00
2012-06-24 02:09:53 +02:00
2012-06-13 22:43:57 +02:00
2012-06-22 23:11:43 +02:00
2012-06-16 01:54:50 +02:00
2012-06-13 22:43:57 +02:00
2012-06-16 15:15:16 +00:00
2012-06-21 12:47:48 +02:00
2012-06-16 15:15:16 +00:00
2012-06-16 15:15:16 +00:00
2012-06-13 22:43:57 +02:00
2012-06-06 01:08:33 +02:00
2012-06-13 11:11:33 +02:00
2012-06-13 22:43:57 +02:00
2012-06-16 15:15:16 +00:00
2012-06-16 15:15:16 +00:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-13 22:43:57 +02:00
2012-06-13 22:43:57 +02:00
2012-06-20 20:14:01 +02:00
2012-06-13 22:43:57 +02:00
2012-06-24 02:09:53 +02:00
2012-06-13 22:43:57 +02:00
2012-06-13 22:43:57 +02:00
2012-05-14 21:36:11 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
1c60088885