Michael Niedermayer d77294c5e4 Merge remote-tracking branch 'qatar/master' ... * qatar/master: libx264: fix indentation. vorbis: fix overflows in floor1[] vector and inverse db table index. win64: add a XMM clobber test configure option. movdec: Parse the dvc1 atom ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6 swscale: K&R formatting cosmetics for Blackfin code frwu: lowercase the FRWU codec name movdec: fix dts generation in fragmented files fate: make acodec-ac3_fixed test output raw AC3 APIchanges: add missing commit hashes swscale: implement MMX, SSE2 and AVX functions for RGB32 input. ra144enc: drop pointless "encoder" from .long_name bethsoftvideo: fix palette reading. mpc7: use av_fast_padded_malloc() mpc7: simplify handling of packet sizes that are not a multiple of 4 bytes doc: decoding Forward Uncompressed is supported Fix a typo in the x86 asm version of ff_vector_clip_int32() pcmenc: Do not set avpkt->size. ff_alloc_packet: modify the size of the packet to match the requested size Conflicts: doc/APIchanges libavcodec/libx264.c libavcodec/mpc7.c libavformat/isom.h libswscale/Makefile libswscale/bfin/yuv2rgb_bfin.c tests/ref/fate/bethsoft-vid tests/ref/seek/ac3_ac3 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-02-03 03:51:32 +01:00
..
ac3_fixed	fate: make acodec-ac3_fixed test output raw AC3	2012-02-02 14:31:54 +00:00
adpcm_adx	fate: add ADX encoding/decoding test	2012-01-03 18:47:42 -05:00
adpcm_ima_qt	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
adpcm_ima_wav	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
adpcm_ms	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
adpcm_swf	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
adpcm_yam	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
alac	Merge remote-tracking branch 'qatar/master'	2012-01-11 02:44:43 +01:00
aref	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
flac	Replace vendor string in Ogg and FLAC muxers.	2011-11-02 10:43:39 +01:00
g722	Merge remote-tracking branch 'qatar/master'	2012-01-08 03:34:22 +01:00
g723_1	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
g726	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
mp2	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
pcm_alaw	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_f32be	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_f32le	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_f64be	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_f64le	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_mulaw	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_s8	Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"	2012-01-22 23:40:24 +01:00
pcm_s16be	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
pcm_s16le	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_s24be	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
pcm_s24daud	Merge remote-tracking branch 'qatar/master'	2011-12-02 00:51:11 +01:00
pcm_s24le	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_s32be	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
pcm_s32le	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
pcm_u8	fate: split acodec-pcm into individual tests	2011-12-01 13:27:56 -05:00
wmav1	tiny_psnr: skip wav headers on input files	2010-07-09 16:06:05 +00:00
wmav2	tiny_psnr: skip wav headers on input files	2010-07-09 16:06:05 +00:00