Michael Niedermayer 3bbf3f7e42 Merge remote-tracking branch 'qatar/master' ... * qatar/master: matroska: Clear prev_pkt between seeks. avutil: change default buffer size alignment for sample buffer functions audemux: Add a sanity check for the number of channels Remove libdirac decoder. matroska: Add incremental parsing of clusters. avconv: fix off by one check in complex_filter mpegts: Try seeking back even for nonseekable protocols swscale: K&R formatting cosmetics (part III) Conflicts: configure doc/general.texi doc/platform.texi ffmpeg.c libavcodec/Makefile libavcodec/allcodecs.c libavcodec/libdirac.h libavcodec/libdiracdec.c libavformat/au.c libavformat/mpegts.c libswscale/input.c tests/ref/seek/lavf_mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-04-24 02:30:41 +02:00
..
fate
ref	Merge remote-tracking branch 'qatar/master'	2012-04-24 02:30:41 +02:00
asynth1.sw
audiogen.c
base64.c
codec-regression.sh
copycooker.sh
fate_config.sh.template
fate-run.sh
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh
lavfi-regression.sh
lena.pnm
Makefile
md5.sh
regression-funcs.sh
rotozoom.c
tiny_psnr.c
videogen.c