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

..

fate

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

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

filtergraphs

fate/filter: test gradfun timeline.

2013-05-12 13:07:47 +02:00

ref

j2kdec/jpeg2000dec: partially merge quantization code

2013-05-28 19:02:00 +02:00

audiogen.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

base64.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

copycooker.sh

build: remove unused copy regression test script

2011-07-07 22:47:24 +02:00

fate-run.sh

Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'

2013-05-08 14:21:39 +02:00

fate-update.sh

…

fate-valgrind.supp

Add a --valgrind configure option.

2012-01-21 12:04:46 +01:00

fate.sh

Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

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

ffserver-regression.sh

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.conf

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.regression.ref

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

lavf-regression.sh

tests/lavf-regression: fix gbrp10 dpx test on big endian

2013-05-13 10:09:03 +00:00

lena.pnm

…

Makefile

Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'

2013-05-29 04:02:23 +02:00

md5.sh

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

regression-funcs.sh

fate: remove unused functions

2012-05-30 05:57:56 +02:00

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00

test.ffmeta

fate/ffprobe: add some stream metadata.

2012-10-08 11:03:27 +02:00

tiny_psnr.c

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

tiny_ssim.c

tests/tiny_ssim: include the 2 macros instead of a header

2013-03-27 01:38:18 +01:00

utils.c

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00