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
..
gradfun.c	Merge remote-tracking branch 'qatar/master'	2012-08-31 13:34:32 +02:00
hqdn3d.asm	Merge remote-tracking branch 'qatar/master'	2012-08-26 22:40:02 +02:00
Makefile	vf_hqdn3d: x86 asm	2012-08-26 10:49:14 +00:00
yadif_template.c	Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'	2012-08-31 13:01:30 +02:00
yadif.c	Merge remote-tracking branch 'qatar/master'	2012-08-31 13:34:32 +02:00