FFmpeg/libavcodec
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-06-02 20:18:44 +02:00
2014-07-16 20:55:24 +02:00
2014-06-03 10:58:19 -08:00
2014-06-15 12:11:46 +02:00
2014-06-15 12:11:46 +02:00
2014-06-03 10:58:19 -08:00
2014-08-14 13:35:24 +02:00
2014-08-14 04:24:14 +02:00
2014-08-12 10:03:20 +00:00
2014-08-06 12:38:26 +02:00
2014-05-31 13:41:10 +02:00
2014-06-05 20:31:59 +02:00
2014-06-05 20:31:59 +02:00
2014-08-09 23:20:31 +02:00
2014-08-05 01:54:47 +02:00
2014-05-25 05:19:09 +02:00
2014-07-18 13:31:19 +02:00
2014-07-12 22:33:27 +02:00
2014-06-07 17:44:23 +02:00
2014-06-07 17:44:14 +02:00
2014-06-07 17:44:14 +02:00
2014-06-18 03:13:37 +02:00
2014-06-18 03:13:37 +02:00
2014-06-18 03:13:36 +02:00
2014-06-18 03:13:36 +02:00
2014-08-12 21:58:45 +02:00
2014-08-12 21:58:45 +02:00