Michael Niedermayer 841a288cb3 Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69' ...

* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
  fate: cosmetics: Order some test entries

Conflicts:
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-01-13 13:42:10 +01:00

..

aac.mak

Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

2012-11-15 11:12:25 +01:00

ac3.mak

fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV

2012-10-31 20:01:08 +01:00

acodec.mak

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

adpcm.mak

fate: add ADPCM 4XM test

2012-11-29 13:24:48 +00:00

alac.mak

FATE: add 24-bit ALAC tests

2012-11-20 00:26:46 -05:00

als.mak

fate-als: add dependencies

2012-10-18 13:12:28 +01:00

amrnb.mak

fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests

2012-11-14 15:09:59 +01:00

amrwb.mak

fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests

2012-11-14 15:09:59 +01:00

atrac.mak

fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests

2012-11-14 15:09:59 +01:00

audio.mak

fate: add some missing dependencies

2012-11-04 19:11:26 +00:00

avfilter.mak

tests/fate/avfilter.mak: merge pp tests into GPL test list

2013-01-06 19:04:24 +01:00

avformat.mak

Sony Wave64 muxer

2012-12-31 07:10:57 +00:00

bmp.mak

fate: Add dependencies for bmp, cdxl, dfa, mp3

2012-12-04 15:24:05 +01:00

cdxl.mak

fate: cosmetics: Order some test entries

2013-01-12 17:19:27 +01:00

cover-art.mak

FATE: add a test for flac cover art.

2012-07-20 10:17:25 +02:00

demux.mak

Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30'

2013-01-11 12:30:32 +01:00

dfa.mak

fate: Add dependencies for bmp, cdxl, dfa, mp3

2012-12-04 15:24:05 +01:00

dpcm.mak

fate: dpcm: Add dependencies

2012-12-07 11:34:16 +01:00

ea.mak

Merge remote-tracking branch 'qatar/master'

2012-12-04 14:23:22 +01:00

ffmpeg.mak

fate/sub2video: move sws flags globally in the filtergraph.

2013-01-02 21:48:56 +01:00

ffprobe.mak

tests: update fate-ffprobe test to make use of -bitexact flag

2012-09-22 09:34:56 +02:00

fft.mak

fate: fft: Fix libavcodec dependency

2012-12-03 01:34:14 +01:00

filter.mak

fate: re-enable lavfi gradfun filter test.

2012-12-19 03:13:26 +01:00

flac.mak

FATE: add a 24-bit FLAC encoding test

2012-11-05 15:32:30 -05:00

h264.mak

Merge remote-tracking branch 'qatar/master'

2012-12-04 14:23:22 +01:00

image.mak

Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'

2012-12-07 15:21:41 +01:00

indeo.mak

fate-indeo: add dependencies

2012-10-18 13:12:28 +01:00

libavcodec.mak

fate: cosmetics: Group idct8x8 test together with all other libavcodec tests

2012-10-23 10:52:15 +02:00

libavformat.mak

fate: Declare avcodec/avformat deps in the respective Makefile snippets

2012-10-23 10:28:40 +02:00

libavutil.mak

Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'

2012-11-29 14:16:46 +01:00

lossless-audio.mak

Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'

2012-12-18 14:27:59 +01:00

lossless-video.mak

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

2013-01-13 13:42:10 +01:00

microsoft.mak

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

2013-01-13 13:42:10 +01:00

mp3.mak

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

mpc.mak

fate-mpc: add dependencies

2012-10-18 13:12:28 +01:00

pcm.mak

tests and tools: cleanup ffmpeg reference

2012-05-27 15:42:55 +02:00

probe.mak

fate: Rename FATE_SAMPLES make file variable to FATE_EXTERN

2012-08-04 09:49:30 +02:00

prores.mak

Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'

2012-11-29 13:35:56 +01:00

qt.mak

Merge remote-tracking branch 'qatar/master'

2012-10-19 14:15:47 +02:00

qtrle.mak

fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests

2012-11-28 14:45:28 +01:00

real.mak

Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'

2012-12-18 14:27:59 +01:00

screen.mak

Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

2012-10-19 13:58:14 +02:00

seek.mak

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

2013-01-13 13:42:10 +01:00

subtitles.mak

fate: re-enable fate-sub-mpsub.

2013-01-01 16:34:00 +01:00

utvideo.mak

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

2013-01-13 13:42:10 +01:00

vcodec.mak

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

2013-01-13 13:42:10 +01:00

video.mak

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

2013-01-13 13:42:10 +01:00

voice.mak

Merge remote-tracking branch 'qatar/master'

2012-10-10 14:13:51 +02:00

vorbis.mak

fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests

2012-11-28 14:45:28 +01:00

vpx.mak

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

2013-01-13 13:42:10 +01:00

vqf.mak

Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

2012-10-19 13:47:47 +02:00

wavpack.mak

fate: cosmetics: Order some test entries

2013-01-12 17:19:27 +01:00

wma.mak

fate: Add dependencies for WMA and WavPack tests

2012-10-23 10:28:40 +02:00