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

tools: Use av_gettime_relative()

2014-05-17 15:51:58 +02:00

bisect-create

…

bookmarklets.html

…

build_libstagefright

tools/build_libstagefright: switch git urls to https

2014-03-12 23:07:00 +01:00

clean-diff

…

crypto_bench.c

Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'

2014-08-15 21:00:50 +02:00

cws2fws.c

…

dvd2concat

tools: add dvd2concat.

2014-03-23 19:15:07 +01:00

enum_options.c

…

ffescape.c

…

ffeval.c

tools/ffeval: print computed value even in case of error

2014-07-05 11:48:24 +02:00

ffhash.c

tools/ffhash: implement base64 output.

2014-04-29 13:24:17 +02:00

fourcc2pixfmt.c

tools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags()

2014-08-10 04:50:31 +02:00

gen-rc

tools/: Add gen-rc tool for generating Windows resource files

2013-12-11 19:27:35 +01:00

graph2dot.c

graph2dot: Add missing #include for av_get_channel_layout_string()

2013-11-04 23:04:10 +01:00

ismindex.c

Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'

2014-08-15 21:26:12 +02:00

make_chlayout_test

…

missing_codec_desc

lavc: add codec descriptors for TTF and OTF.

2014-04-29 13:24:18 +02:00

normalize.py

…

patcheck

fix various typos

2014-06-03 10:58:19 -08:00

pktdumper.c

…

plotframes

…

probetest.c

Add missing initialization for AVProbeData.

2014-08-11 21:10:22 +02:00

qt-faststart.c

Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'

2014-03-01 14:44:58 +01:00

seek_print.c

…

trasher.c

…

uncoded_frame.c

tools/uncoded_frame: fix audio codec generation

2014-03-29 09:25:14 +01:00

unwrap-diff

…

yuvcmp.c

tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>

2014-07-08 01:56:33 +02:00

zmqsend.c

tools/zmqsend: rename ctx to zmq_ctx

2013-12-23 18:44:52 +01:00

zmqshell.py

…