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

..

aac.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

ac3.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

adpcm.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

als.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

amrnb.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

amrwb.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

atrac.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

audio.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

bmp.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

cdxl.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

dct.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

demux.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

dfa.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

dpcm.mak

fate: split idroq audio and video into separate tests

2012-05-09 14:13:34 +01:00

ea.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

fft.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

h264.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

image.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

indeo.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

libavcodec.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

libavutil.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

lossless-audio.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

lossless-video.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

mapchan.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

microsoft.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

mp3.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

mpc.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

pcm.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

probe.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

prores.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

qt.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

qtrle.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

real.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

screen.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

utvideo.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

video.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

voice.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

vorbis.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00

vpx.mak

Merge remote-tracking branch 'qatar/master'

2012-05-11 20:57:39 +02:00

vqf.mak

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

wavpack.mak

fate: cosmetics: lowercase some comments

2012-05-09 18:12:28 +02:00

wma.mak

fate: improve dependencies

2012-05-09 14:13:34 +01:00