Michael Niedermayer fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' ...

* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

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

2014-08-15 21:00:50 +02:00

..

aix

Merge remote-tracking branch 'qatar/master'

2013-07-19 11:08:38 +02:00

avisynth

Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'

2014-08-15 21:00:50 +02:00

float

Merge remote-tracking branch 'qatar/master'

2014-03-10 12:05:02 +01:00

msvcrt

MinGW: Use our snprintf/vsnprintf when MinGW's is broken

2012-09-25 18:14:14 -04:00

plan9

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

tms470

Merge remote-tracking branch 'qatar/master'

2013-07-19 11:08:38 +02:00

windows

build: Import makedef script from c99-to-c89

2013-11-24 19:36:09 +00:00

getopt.c

Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'

2014-08-15 21:00:50 +02:00

os2threads.h

Fix compilation with os2threads

2013-11-07 20:46:44 +01:00

strtod.c

Use the avstring.h locale-independent character type functions

2013-03-07 15:16:36 +02:00

va_copy.h

compat: provide va_copy for old gcc versions.

2013-12-30 12:38:03 +01:00

w32pthreads.h

Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'

2014-08-15 12:31:29 +02:00