Michael Niedermayer c617bed34f Merge remote-tracking branch 'qatar/master' ... * qatar/master: MSS1 and MSS2: set final pixel format after common stuff has been initialised MSS2 decoder configure: handle --disable-asm before check_deps x86: Split inline and external assembly #ifdefs configure: x86: Separate inline from standalone assembler capabilities pktdumper: Use a custom define instead of PATH_MAX for buffers pktdumper: Use av_strlcpy instead of strncpy pktdumper: Use sizeof(variable) instead of the direct buffer length Conflicts: Changelog configure libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/dct-test.c libavcodec/imgconvert.c libavcodec/mss12.c libavcodec/version.h libavfilter/x86/gradfun.c libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-08-31 13:34:32 +02:00
..
x86	x86: Split inline and external assembly #ifdefs	2012-08-31 01:53:25 +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
internal.h	libavresample: add mix level normalization option	2012-08-14 23:36:56 +02:00
libavresample.v
Makefile
options.c	AVOptions: store defaults for INT64 options in int64 union member.	2012-08-24 11:25:06 +02:00
resample_template.c
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