Michael Niedermayer 77aedc77ab Merge remote-tracking branch 'qatar/master' ... * qatar/master: swscale: Provide the right alignment for external mmx asm x86: Replace checks for CPU extensions and flags by convenience macros configure: msvc: fix/simplify setting of flags for hostcc x86: mlpdsp: mlp_filter_channel_x86 requires inline asm Conflicts: libavcodec/x86/fft_init.c libavcodec/x86/h264_intrapred_init.c libavcodec/x86/h264dsp_init.c libavcodec/x86/mpegaudiodec.c libavcodec/x86/proresdsp_init.c libavutil/x86/float_dsp_init.c libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-09-09 13:27:42 +02:00
..
x86	x86: Replace checks for CPU extensions and flags by convenience macros	2012-09-08 18:18:34 +02:00
audio_convert.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
audio_convert.h	doxygen: Fix function parameter names to match the code	2012-08-09 20:05:55 +02:00
audio_data.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
audio_data.h
audio_mix_matrix.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
audio_mix.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
audio_mix.h	doxygen: Fix function parameter names to match the code	2012-08-09 20:05:55 +02:00
avresample-test.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
avresample.h	lavr: resampling: add filter type and Kaiser window beta to AVOptions	2012-07-08 15:22:11 -04:00
internal.h	libavresample: add mix level normalization option	2012-08-14 23:36:56 +02:00
libavresample.v
Makefile
options.c	avopt: Explicitly store float/double option defaults in .dbl	2012-09-04 23:13:51 +03:00
resample_template.c	Merge remote-tracking branch 'qatar/master'	2012-07-09 22:40:12 +02:00
resample.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
resample.h
utils.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
version.h	Clarify Doxygen comment for FF_API_* #defines.	2012-07-04 15:10:10 +02:00