Michael Niedermayer 2cb4d51654 Merge remote-tracking branch 'qatar/master' ... * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-07-23 21:25:09 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
lavf	ffmpeg: rework checks for the -t option.	2012-07-04 16:20:47 +02:00
lavf-fate	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
lavfi	lavfi: add alphaextract and alphamerge filters	2012-07-22 12:17:34 +02:00
seek	vocenc: fix sample rate rounding direction	2012-06-25 03:30:12 +02:00
vsynth1	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00