Michael Niedermayer 9eb99ab25b Merge remote-tracking branch 'qatar/master' ... * qatar/master: fate: employ better names and add a convenient shorthand for vp6 tests arm/neon: dsputil: use correct size specifiers on vld1/vst1 arm: dsputil: prettify some conditional instructions in put_pixels macros vqavideo: change x/y loop counters to the usual pattern avconv: use lrint() for rounding double timestamps Conflicts: tests/ref/fate/vc1-ism Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-05-11 20:57:39 +02:00
..
acodec	Merge remote-tracking branch 'qatar/master'	2012-04-20 22:18:26 +02:00
fate	Merge remote-tracking branch 'qatar/master'	2012-05-11 20:57:39 +02:00
lavf	Merge remote-tracking branch 'qatar/master'	2012-04-25 23:17:41 +02:00
lavf-fate	latmenc: copy pce config from proper location.	2012-04-12 20:28:37 +02:00
lavfi	Support yuva422p rawvideo in nut.	2012-05-08 10:37:13 +02:00
seek	fate: update ogg seektest after all the bug fixes	2012-05-04 14:40:22 +02:00
vsynth1	Merge commit '3b266da3d3'	2012-04-17 04:03:50 +02:00
vsynth2	Merge commit '3b266da3d3'	2012-04-17 04:03:50 +02:00