Michael Niedermayer 86e107a7d4 Merge remote-tracking branch 'qatar/master' ... * qatar/master: cosmetics: Consistently use C-style comments with multiple inclusion guards anm: fix a few Doxygen comments misc typo and wording fixes attributes: add av_noreturn attributes: drop pointless define guards configure: do not disable av_always_inline with --enable-small flvdec: initial stream switch support avplay: fix write on freed memory for rawvideo snow: remove a VLA used for edge emulation x86: lavfi: fix gradfun/yadif build with mmx/sse disabled snow: remove the runs[] VLA. snow: Check mallocs at init flacdec: remove redundant setting of avctx->sample_fmt Conflicts: ffplay.c libavcodec/h264.c libavcodec/snow.c libavcodec/snow.h libavcodec/snowdec.c libavcodec/snowenc.c libavformat/flvdec.c libavutil/attributes.h tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-07-04 00:32:31 +02:00
..
gradfun.c	Merge remote-tracking branch 'qatar/master'	2012-07-04 00:32:31 +02:00
Makefile
yadif_template.c	Merge remote-tracking branch 'qatar/master'	2012-07-02 21:19:41 +02:00
yadif.c	Merge remote-tracking branch 'qatar/master'	2012-07-04 00:32:31 +02:00