Michael Niedermayer e31518e86e Merge commit '36fc320747' into release/0.10 ... * commit '36fc320747': nuv: Pad the lzo outbuf nuv: Do not ignore lzo decompression failures oma: correctly mark and decrypt partial packets oma: check geob tag boundary Conflicts: libavcodec/nuv.c libavformat/omadec.c tests/ref/fate/nuv Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-11-04 18:50:55 +01:00
..
acodec	Merge remote-tracking branch 'qatar/release/0.8' into release/0.10	2012-03-16 09:01:08 +01:00
fate	Merge commit '36fc320747' into release/0.10	2013-11-04 18:50:55 +01:00
lavf	asfenc: properly write index information	2012-09-12 16:48:59 +02:00
lavfi	Merge remote-tracking branch 'qatar/master'	2012-01-10 03:50:41 +01:00
seek	asfenc: properly write index information	2012-09-12 16:48:59 +02:00
vsynth1	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
vsynth2	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00