Michael Niedermayer 7bd417c22a Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e' ...

* commit '6516632967da5e6bd7d6136e8678f826669ed26e':
  tests: Only run noproxy test if networking is enabled
  fifo: K&R formatting cosmetics

Conflicts:
	libavformat/Makefile
	libavutil/fifo.c

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

2013-07-07 11:26:28 +02:00

..

fate

Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'

2013-07-07 11:26:28 +02:00

filtergraphs

fate/filter: test gradfun timeline.

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

ref

Fix opacity and increase colour dynamics of initial vmd palette.

2013-07-04 18:01:08 +02:00

audiogen.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

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

base64.c

…

copycooker.sh

…

fate-run.sh

Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'

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

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

Merge remote-tracking branch 'qatar/master'

2013-05-29 11:19:25 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

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 '2d2d6a4883479403798f4ed46941d5b365823570'

2013-05-29 10:40:42 +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