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	Simplify asynth sample generation.	2012-04-23 21:14:58 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2012-04-24 02:30:41 +02:00
asynth1.sw
audiogen.c	Merge remote-tracking branch 'qatar/master'	2012-04-20 22:18:26 +02:00
base64.c
codec-regression.sh	Get rid of tests/data/asynth-%.sw rule.	2012-04-23 23:26:05 +02:00
copycooker.sh
fate_config.sh.template
fate-run.sh	Merge remote-tracking branch 'qatar/master'	2012-04-19 21:23:52 +02:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-04-20 22:18:26 +02:00
lavfi-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-04-14 22:37:43 +02:00
lena.pnm
Makefile	Get rid of tests/data/asynth-%.sw rule.	2012-04-23 23:26:05 +02:00
md5.sh
regression-funcs.sh	Get rid of tests/data/asynth-%.sw rule.	2012-04-23 23:26:05 +02:00
rotozoom.c	tests/rotozoom: make some things const.	2012-03-15 21:52:11 +01:00
tiny_psnr.c	tiny_psnr: reindent after last commit.	2012-04-15 15:46:46 +02:00
videogen.c