Michael Niedermayer aedc908601 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (35 commits) flvdec: Do not call parse_keyframes_index with a NULL stream libspeexdec: include system headers before local headers libspeexdec: return meaningful error codes libspeexdec: cosmetics: reindent libspeexdec: decode one frame at a time. swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables() Move timefilter code from lavf to lavd. mov: add support for hdvd and pgapmetadata atoms mov: rename function _stik, some indentation cosmetics mov: rename function _int8 to remove ambiguity, some indentation cosmetics mov: parse the gnre atom mp3on4: check for allocation failures in decode_init_mp3on4() mp3on4: create a separate flush function for MP3onMP4. mp3on4: ensure that the frame channel count does not exceed the codec channel count. mp3on4: set channel layout mp3on4: fix the output channel order mp3on4: allocate temp buffer with av_malloc() instead of on the stack. mp3on4: copy MPADSPContext from first context to all contexts. fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm ... Conflicts: libavcodec/arm/h264dsp_init_arm.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_ps.c libavcodec/h264dsp_template.c libavcodec/h264idct_template.c libavcodec/h264pred.c libavcodec/h264pred_template.c libavcodec/x86/h264dsp_mmx.c libavdevice/Makefile libavdevice/jack_audio.c libavformat/Makefile libavformat/flvdec.c libavformat/flvenc.c libavutil/pixfmt.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-10-22 01:16:41 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2011-10-22 01:16:41 +02:00
audiogen.c
base64.c
codec-regression.sh	reg tests: add g723.1	2011-10-10 02:58:18 +02:00
copycooker.sh
fate2.mak	g722: Add a fate test for the encoder	2011-10-18 10:45:22 +03:00
fate-run.sh	Merge remote-tracking branch 'qatar/master'	2011-10-10 03:50:58 +02:00
fate-update.sh
fate.mak	Merge remote-tracking branch 'qatar/master'	2011-10-08 03:39:01 +02:00
fate.sh	fate.sh: Ignore errors from rm command during cleanup.	2011-09-22 17:39:30 +02:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-09-12 00:32:54 +02:00
lavfi-regression.sh
lena.pnm
Makefile	Merge remote-tracking branch 'qatar/master'	2011-10-19 02:08:59 +02:00
md5.sh
regression-funcs.sh	Merge remote-tracking branch 'qatar/master'	2011-10-10 03:50:58 +02:00
rotozoom.c
tiny_psnr.c
videogen.c