Michael Niedermayer e37f161e66 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-28 07:53:34 +01:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-01-20 02:14:54 +01:00
ref	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
asynth1.sw	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
audiogen.c	Merge remote-tracking branch 'qatar/master'	2012-01-19 01:19:38 +01:00
base64.c	Merge remote-tracking branch 'qatar/master'	2012-01-19 01:19:38 +01:00
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00
copycooker.sh
fate_config.sh.template	tests: add a FATE configuration template	2011-11-24 00:33:20 +01:00
fate-run.sh	fate: give stderr hint when a test fails.	2011-12-26 22:27:01 +01:00
fate-update.sh
fate-valgrind.supp	Add a --valgrind configure option.	2012-01-21 12:04:46 +01: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'	2012-01-28 07:53:34 +01:00
lavfi-regression.sh
lena.pnm
Makefile	fate: add GEN tag for mapchan sw tests.	2012-01-17 00:13:04 +01:00
md5.sh
regression-funcs.sh	Run zmbv regression without md5sum.	2011-12-10 19:34:28 +01:00
rotozoom.c	Merge remote-tracking branch 'qatar/master'	2012-01-19 01:19:38 +01:00
tiny_psnr.c	Merge remote-tracking branch 'qatar/master'	2012-01-19 01:19:38 +01:00
videogen.c	Merge remote-tracking branch 'qatar/master'	2012-01-19 01:19:38 +01:00