Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 19:21:14 +0000 (21:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 19:26:12 +0000 (21:26 +0200)
commit60dbed6067676d847157fe530b1caed06c77e2ab
tree62d43c9dc8162c8c809cc689f599befb2fdc2bbe
parentfb33bff990a8327f59d4c7c509bba1f62bbd6c5a
parent4b1f5e5090abed6c618c8ba380cd7d28d140f867
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>
21 files changed:
cmdutils.c
libavcodec/h263dec.c
libavcodec/h264_refs.c
libavcodec/libvpxenc.c
libavcodec/libxvid.c
libavcodec/mpeg12dec.c
libavcodec/qdm2.c
libavcodec/rv10.c
libavcodec/rv34.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavformat/avio.c
libavformat/http.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/rtmpproto.c
libavformat/tls.c
libavformat/url.c
libavutil/opt.c
tests/audiogen.c
tools/ismindex.c