Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 18:33:21 +0000 (20:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 19:00:50 +0000 (21:00 +0200)
commitfb33bff990a8327f59d4c7c509bba1f62bbd6c5a
treec6f3ad232bed67c703999d78b3fcff66daa8c91d
parent3bb22973518cbef28504e4d5b9fd74453cc3339c
parentf929ab0569ff31ed5a59b0b0adb7ce09df3fca39
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>
62 files changed:
cmdutils.c
compat/avisynth/avisynth_c.h
compat/getopt.c
ffmpeg.c
ffplay.c
ffserver.c
libavcodec/atrac3.c
libavcodec/cook.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/huffyuvdec.c
libavcodec/interplayvideo.c
libavcodec/lcldec.c
libavcodec/libmp3lame.c
libavcodec/libopusenc.c
libavcodec/libstagefright.cpp
libavcodec/libutvideoenc.cpp
libavcodec/libvpxenc.c
libavcodec/libxvid.c
libavcodec/motion_est.c
libavcodec/mpeg12dec.c
libavcodec/mpegaudiodec_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/options.c
libavcodec/opus_celt.c
libavcodec/qdm2.c
libavcodec/roqvideo.c
libavcodec/rv10.c
libavcodec/tscc.c
libavcodec/vc1dec.c
libavcodec/vp3.c
libavcodec/vp8.c
libavcodec/zmbv.c
libavcodec/zmbvenc.c
libavdevice/v4l2.c
libavfilter/vf_vidstabtransform.c
libavformat/avs.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/movenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/rtpenc.c
libavformat/rtspdec.c
libavformat/rtspenc.c
libavformat/sdp.c
libavformat/webmdashenc.c
libavutil/eval.c
libavutil/file.c
libavutil/imgutils.h
libavutil/internal.h
libpostproc/postprocess.c
tools/crypto_bench.c