ffmpeg/tests
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
filtergraphs
ref
Makefile
audiogen.c
base64.c
copycooker.sh
fate-run.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh
lena.pnm
md5.sh
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c
tiny_ssim.c
utils.c
videogen.c