Michael Niedermayer 60dbed6067 Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' ...

* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
  cosmetics: Write NULL pointer inequality checks more compactly

Conflicts:
	libavcodec/dvdsubdec.c
	libavcodec/h263dec.c
	libavcodec/libxvid.c
	libavcodec/rv10.c
	libavcodec/utils.c
	libavformat/format.c
	libavformat/matroskadec.c
	libavformat/segment.c
	libavutil/opt.c

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

2014-08-15 21:26:12 +02:00

..

fate

tests/fate/libavutil: switch cpu-test back to runecho so its results are vissible

2014-08-06 01:57:35 +02:00

filtergraphs

Merge remote-tracking branch 'qatar/master'

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

ref

avfilter/select: larger pixel sad computation

2014-08-14 19:11:13 +02:00

audiogen.c

Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'

2014-08-15 21:26:12 +02:00

base64.c

…

copycooker.sh

…

fate-run.sh

Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

2014-08-01 15:03:22 +02:00

fate-valgrind.supp

…

fate.sh

tests/fate.sh: If cat *.rep fails try it with a for loop.

2014-07-28 18:34:16 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

fate: Add test for wav Peak Envelope Chunk encoder (levl chunk).

2014-07-18 19:38:54 +02:00

lena.pnm

…

Makefile

Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'

2014-08-04 14:23:46 +02:00

md5.sh

…

regression-funcs.sh

Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'

2014-05-15 19:16:57 +02:00

rotozoom.c

…

test.ffmeta

…

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: more correct error message

2014-05-05 19:00:14 +02:00

utils.c

…

videogen.c

tests: allow passing dimensions to videogen

2014-05-29 21:26:48 +02:00