Michael Niedermayer f58f75dd92 Merge remote-tracking branch 'qatar/master' ... * qatar/master: rv34: error out on size changes with frame threading aacsbr: Add a debug check to sbr_mapping. aac: Reset some state variables when turning SBR off aac: Reset PS parameters on header decode failure. fate: add wmalossless test. aacsbr: handle m_max values smaller than 4. Conflicts: libavcodec/aacsbr.c tests/fate/lossless-audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-03-24 10:59:43 +01:00
..
acodec	Merge remote-tracking branch 'qatar/master'	2012-03-22 00:40:11 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2012-03-24 10:59:43 +01:00
lavf	Merge remote-tracking branch 'qatar/master'	2012-03-22 00:40:11 +01:00
lavf-fate
lavfi	vf_pad: port to new drawutils API.	2012-03-21 15:52:45 +01:00
seek	Merge remote-tracking branch 'qatar/master'	2012-03-22 00:40:11 +01:00
vsynth1	Merge remote-tracking branch 'qatar/master'	2012-03-15 01:27:10 +01:00
vsynth2	Merge remote-tracking branch 'qatar/master'	2012-03-15 01:27:10 +01:00