Michael Niedermayer 1f5e5d2205 Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791' ...

* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
  fate: Add a --target-samples path parameter

Conflicts:
	configure
	tests/fate/audio.mak
	tests/fate/cover-art.mak
	tests/fate/demux.mak
	tests/fate/ea.mak
	tests/fate/filter-video.mak
	tests/fate/h264.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/pcm.mak
	tests/fate/prores.mak
	tests/fate/qt.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/vpx.mak
	tests/fate/vqf.mak

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

2013-05-29 04:25:37 +02:00

..

aac.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

ac3.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

acodec.mak

fate: re-enable fate-acodec-dca2

2013-04-25 23:23:12 +02:00

adpcm.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

alac.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

als.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

amrnb.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

amrwb.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

atrac.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

audio.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

avformat.mak

Add some fate dependencies to fix make fate with --disable-everything.

2013-03-09 15:46:46 +01:00

bmp.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

cdxl.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

cover-art.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

demux.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

dfa.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

dpcm.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

ea.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

ffmpeg.mak

fate: add tests for unknown channel layouts.

2013-04-11 13:09:33 +02:00

ffprobe.mak

…

fft.mak

fate: fft: Fix libavcodec dependency

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

filter-audio.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

filter-video.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

flac.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

gif.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

h264.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

image.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

indeo.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

libavcodec.mak

…

libavformat.mak

lavf: Add a fate test for the noproxy pattern matching

2013-02-27 21:32:14 +02:00

libavutil.mak

Add 128 bit murmur3 hash function.

2013-05-13 21:42:37 +02:00

lossless-audio.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

lossless-video.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

microsoft.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

monkeysaudio.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

mp3.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

mpc.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

pcm.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

probe.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

prores.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

qt.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

qtrle.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

real.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

screen.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

seek.mak

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

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

subtitles.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

utvideo.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

vcodec.mak

j2kenc: Allow encoding with the 9/7 wavelet

2013-05-27 18:50:18 +02:00

video.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

voice.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

vorbis.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

vpx.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

vqf.mak

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

2013-05-29 04:25:37 +02:00

wavpack.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00

wma.mak

fate: Add a --target-samples path parameter

2013-05-28 17:16:54 +03:00