Michael Niedermayer 6968a7d193 Merge remote-tracking branch 'qatar/master' ... * qatar/master: doc/general: update supported devices table. doc/general: add missing @tab to codecs table. h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction. avconv: reindent avconv: link '-passlogfile' option to libx264 'stats' AVOption. libx264: add 'stats' private option for setting 2pass stats filename. libx264: fix help text for slice-max-size option. http: Clear the auth state on redirects http: Retry auth if it failed due to being stale rtsp: Resend new keepalive commands if they used stale auth rtsp: Retry authentication if failed due to being stale httpauth: Parse the stale field in digest auth dxva2_vc1: pass the overlap flag to the decoder dxva2_vc1: fix decoding of BI frames FATE: add shorthand to wavpack test dfa: convert to bytestream2 API anm decoder: move buffer allocation from decode_init() to decode_frame() h264: improve parsing of broken AVC SPS Conflicts: ffmpeg.c libavcodec/anm.c libavcodec/dfa.c libavcodec/h264.c libavcodec/h264_direct.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-03-14 02:10:11 +01:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-03-14 02:10:11 +01:00
ref	FATE: add test for cdxl demuxer	2012-03-12 17:01:58 +02:00
asynth1.sw
audiogen.c
base64.c
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-03-01 03:17:11 +01:00
copycooker.sh
fate_config.sh.template
fate-run.sh	Merge remote-tracking branch 'qatar/master'	2012-03-07 03:22:49 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh	fate: add support for specifying the shell used to run configure	2012-01-30 20:35:09 +01:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-03-05 00:15:55 +01:00
lavfi-regression.sh	fate: disable deshake test as it isnt binary identical across archs.	2012-02-29 07:03:04 +01:00
lena.pnm
Makefile	Merge remote-tracking branch 'qatar/master'	2012-03-07 03:22:49 +01:00
md5.sh
regression-funcs.sh	Merge remote-tracking branch 'qatar/master'	2012-03-07 03:22:49 +01:00
rotozoom.c
tiny_psnr.c
videogen.c