Michael Niedermayer 00c0465dbc Merge remote-tracking branch 'qatar/master' ... * qatar/master: fate: split off DPCM codec FATE tests into their own file fate: split off PCM codec FATE tests into their own file libvorbis: K&R reformatting cosmetics libmp3lame: K&R formatting cosmetics fate: Add a video test for xxan decoder mpegvideo_enc: K&R cosmetics (line 1000-2000). avconv: K&R cosmetics qt-faststart: Fix up indentation indeo4: remove two unused variables doxygen: cleanup style to support older doxy fate: add more tests for VC-1 decoder applehttpproto: Apply the same reload interval changes as for the demuxer applehttp: Use half the target duration as interval if the playlist didn't update applehttp: Use the last segment duration as reload interval lagarith: add decode support for arith rgb24 mode Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-12-30 03:46:24 +01:00
..
acodec	movenc: disable iods by default	2011-12-16 03:50:19 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2011-12-30 03:46:24 +01:00
lavf	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
lavfi	Merge remote-tracking branch 'qatar/master'	2011-12-21 03:40:53 +01:00
seek	mxfdec: Hybrid demuxing/seeking solution	2011-12-16 11:54:03 +01:00
vsynth1	cljrdec: improve scaling somewhat	2011-12-28 22:05:24 +01:00
vsynth2	cljrdec: improve scaling somewhat	2011-12-28 22:05:24 +01:00