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
..
2014-05-17 15:51:58 +02:00
2012-10-26 18:24:50 +02:00
2014-03-23 19:15:07 +01:00
2013-03-07 01:12:04 +01:00
2014-06-03 10:58:19 -08:00
2013-01-15 22:50:19 +01:00
2013-09-21 14:40:31 +02:00
2013-12-23 18:44:52 +01:00
2013-05-19 17:59:21 +02:00