ffmpeg/tools
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
..
aviocat.c
bisect-create
bookmarklets.html
build_libstagefright
clean-diff
crypto_bench.c Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
cws2fws.c
dvd2concat
enum_options.c
ffescape.c
ffeval.c
ffhash.c
fourcc2pixfmt.c
gen-rc
graph2dot.c
ismindex.c Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' 2014-08-15 21:26:12 +02:00
make_chlayout_test
missing_codec_desc
normalize.py
patcheck
pktdumper.c
plotframes
probetest.c Add missing initialization for AVProbeData. 2014-08-11 21:10:22 +02:00
qt-faststart.c
seek_print.c
trasher.c
uncoded_frame.c
unwrap-diff
yuvcmp.c
zmqsend.c
zmqshell.py