• Michael Niedermayer's avatar
    Merge commit 'f929ab05' · fb33bff9
    Michael Niedermayer authored
    * commit 'f929ab05':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    fb33bff9