Michael Niedermayer fb33bff990 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>

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

..

aviocat.c

tools: Use av_gettime_relative()

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

bisect-create

tools/bisect-create: Support "bisect run"

2012-07-24 01:24:23 +02:00

bookmarklets.html

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

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

cws2fws: check fstat return code.

2012-10-26 18:24:50 +02:00

dvd2concat

tools: add dvd2concat.

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

enum_options.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

ffescape.c

lavu: add escape API

2013-03-07 01:12:04 +01:00

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 'f920d089535bf7cf10aeda900cc43201c5e18cd0'

2014-07-03 21:02:56 +02:00

make_chlayout_test

tools: add make_chlayout_test perl script.

2012-08-28 15:18:27 +02:00

missing_codec_desc

lavc: add codec descriptors for TTF and OTF.

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

normalize.py

tools: add audio normalize script example.

2013-03-26 01:50:13 +01:00

patcheck

fix various typos

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

pktdumper.c

Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

2013-07-07 11:35:59 +02:00

plotframes

tools: add plotframes script

2013-01-15 22:50:19 +01:00

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

tools: Fix apparent merge failure

2013-09-21 14:40:31 +02:00

trasher.c

trasher: check seek return value.

2012-10-13 20:35:56 +02:00

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

tools: add zmqshell.py.

2013-05-19 17:59:21 +02:00