Michael Niedermayer b36095ea0f Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44' ... * commit '3e2f200237af977b9253b0aff121eee27bcedb44': roqvideodec: fix a potential infinite loop in roqvideo_decode_frame(). xxan: fix invalid memory access in xan_decode_frame_type0() tty: set avg_frame_rate. FATE: enable multiple slices in the ffv1 vsynth test Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-03-12 15:57:28 +01:00
..
acodec	lswr: Improve default resampler's default parameters	2013-01-04 16:47:57 +01:00
fate	Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'	2013-03-12 12:49:59 +01:00
lavf	movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd	2013-02-14 17:48:08 +01:00
lavf-fate	mp3dec: Fix VBR bit rate parsing	2013-03-05 13:06:01 +01:00
lavfi	tests: add overlay rgb and yuv444 tests	2013-03-05 13:20:13 +01:00
seek	Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'	2013-03-12 15:57:28 +01:00
vsynth	Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'	2013-03-12 15:57:28 +01:00
vsynth1
vsynth2