Michael Niedermayer 5297003aa7 Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' ...

* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
  LucasArts SMUSH demuxer

Conflicts:
	Changelog
	doc/general.texi
	libavformat/smush.c
	libavformat/version.h

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

2014-04-06 23:29:47 +02:00

..

fate

Merge commit '287432430c5c9cb8ffe1da1376949de494f24e45'

2014-04-04 15:09:52 +02:00

filtergraphs

Merge remote-tracking branch 'qatar/master'

2014-03-16 14:32:47 +01:00

ref

Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'

2014-04-06 23:29:47 +02:00

audiogen.c

Merge remote-tracking branch 'qatar/master'

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

base64.c

…

copycooker.sh

…

fate-run.sh

Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

2014-03-18 01:29:50 +01:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

tests/fate: fix fate on branches different from origin/master

2013-10-29 21:53:59 +01:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

2014-03-18 01:29:50 +01:00

lena.pnm

…

Makefile

Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

2014-03-18 01:29:50 +01:00

md5.sh

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

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

regression-funcs.sh

Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

2014-03-18 01:29:50 +01:00

rotozoom.c

…

test.ffmeta

fate/ffprobe: add some stream metadata.

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

tiny_psnr.c

tests/tiny_psnr: Print information about the supported sample types in the help and error texts

2014-03-24 04:02:51 +01:00

tiny_ssim.c

tests/tiny_ssim: drop isatty() support

2014-02-21 17:29:58 +01:00

utils.c

…

videogen.c

…