Michael Niedermayer d9d7c54960 Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a' ...

* commit 'ba8efac977f4276f05274947b2b67d144cbc965a':
  af_channelmap: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/af_channelmap.c

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

2013-04-11 02:10:12 +02:00

..

fate

fate: add coverage for background disposal in gif decoder

2013-04-06 11:20:27 +00:00

filtergraphs

Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'

2013-04-11 02:10:12 +02:00

ref

lavc: fix recoded subtitles end.

2013-04-07 13:25:24 +02:00

audiogen.c

…

base64.c

…

copycooker.sh

…

fate-run.sh

fate: Print correct error message for reference generation too

2013-03-30 11:41:58 +01:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

…

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

2013-03-12 21:34:24 +01:00

lavfi-regression.sh

lavfi/pp: switch to an AVOptions-based system.

2013-04-10 23:16:03 +02:00

lena.pnm

…

Makefile

coverage: filter /usr/include out

2013-04-06 13:47:17 +02:00

md5.sh

…

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

…

tiny_ssim.c

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

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

utils.c

…

videogen.c

…