Michael Niedermayer 015903294c Merge remote-tracking branch 'qatar/master' ... * qatar/master: (25 commits) rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC ape: Use unsigned integer maths arm: dsputil: fix overreads in put/avg_pixels functions h264: K&R formatting cosmetics for header files (part II/II) h264: K&R formatting cosmetics for header files (part I/II) rtmp: Implement check bandwidth notification. rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player. rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin. rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream. cmdutils: Add fallback case to switch in check_stream_specifier(). sctp: be consistent with socket option level configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags. vcr1enc: drop pointless empty encode_init() wrapper function vcr1: drop pointless write-only AVCodecContext member from VCR1Context vcr1: group encoder code together to save #ifdefs vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments mov: make one comment slightly more specific lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX lavfi: move audio-related functions to a separate file. lavfi: remove some audio-related function from public API. ... Conflicts: cmdutils.c libavcodec/h264.h libavcodec/h264_mvpred.h libavcodec/vcr1.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavfilter/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-05-10 23:30:42 +02:00
..
x86	lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX	2012-05-09 16:17:59 -04:00
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix_matrix.c	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
audio_mix.c	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
audio_mix.h	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
avresample-test.c
avresample.h	lavr: make avresample_read() with NULL output discard samples.	2012-05-09 17:37:47 +02:00
internal.h
libavresample.v
Makefile	build: cosmetics: Add missing end-of-line backslashes to item lists.	2012-05-07 14:17:40 +02:00
options.c	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
resample.c
resample.h
utils.c	Merge remote-tracking branch 'qatar/master'	2012-05-10 02:25:41 +02:00
version.h	lavr: make avresample_read() with NULL output discard samples.	2012-05-09 17:37:47 +02:00