Michael Niedermayer 17e4b0644b Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b' ...

* commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
  fate: dependencies for acodec tests
  fate: dependencies for vsynth tests
  fate: add macros useful for conditionally enabling things
  libmp3lame: resize the output buffer if needed

Conflicts:
	tests/fate/acodec.mak
	tests/fate/vcodec.mak

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

2012-10-18 10:48:00 +02:00

..

fate

Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'

2012-10-18 10:48:00 +02:00

ref

Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

2012-10-17 15:16:23 +02:00

asynth1.sw

movenc: Decrease default chunk merge limit to 1mb.

2012-01-23 23:41:32 +01:00

audiogen.c

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

base64.c

Merge remote-tracking branch 'qatar/master'

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

copycooker.sh

…

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

fate-update.sh

…

fate-valgrind.supp

Add a --valgrind configure option.

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

fate.sh

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

fate: add faststart regression test.

2012-09-27 08:59:37 +02:00

lavfi-regression.sh

fate: add vf_idet filter to lavfi regression tests

2012-10-11 02:21:28 +02:00

lena.pnm

…

Makefile

Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'

2012-10-18 10:48:00 +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

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