Michael Niedermayer 4453f6b861 Merge remote-tracking branch 'qatar/master' ... * qatar/master: flv: add support for G.711 doc: git: Add checklist with test steps to perform before pushing flvenc: K&R formatting cosmetics movenc: Add channel layouts for PCM. Conflicts: libavformat/flvenc.c tests/ref/fate/acodec-pcm-s16be tests/ref/fate/acodec-pcm-s24be tests/ref/fate/acodec-pcm-s32be tests/ref/fate/acodec-pcm-s8 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-06-28 23:57:31 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-06-28 23:57:31 +02:00
lavf	vocenc: use new header from codec tag 4	2012-06-25 03:45:29 +02:00
lavf-fate	latmenc: copy pce config from proper location.	2012-04-12 20:28:37 +02:00
lavfi	lavfi/super2xsai: fix fate test on bigendian	2012-06-16 09:35:05 +00:00
seek	vocenc: fix sample rate rounding direction	2012-06-25 03:30:12 +02:00
vsynth1	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00