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
..
acodec	Merge remote-tracking branch 'qatar/master'	2012-04-20 22:18:26 +02:00
fate	parseutils: add av_parse_time() test.	2012-04-23 14:39:01 +02:00
lavf	Merge remote-tracking branch 'qatar/master'	2012-04-20 22:18:26 +02:00
lavf-fate	latmenc: copy pce config from proper location.	2012-04-12 20:28:37 +02:00
lavfi	vf_thumbnail: colorspace changed from yv12 to rgb	2012-04-17 04:06:27 +02:00
seek	Merge remote-tracking branch 'qatar/master'	2012-04-24 02:30:41 +02:00
vsynth1	Merge commit '3b266da3d3'	2012-04-17 04:03:50 +02:00
vsynth2	Merge commit '3b266da3d3'	2012-04-17 04:03:50 +02:00