Michael Niedermayer 0bb474f686 Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f' ...

* commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
	tools/qt-faststart.c

See: 59003fe7c064e98359cce83b1b727fb1026bdf12
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-01 13:47:08 +01:00

..

aviocat.c

Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'

2014-01-17 14:38:33 +01:00

bisect-create

…

bookmarklets.html

…

build_libstagefright

…

clean-diff

…

crypto_bench.c

tools/crypto_bench: fix 2 typos.

2013-09-04 21:59:34 +02:00

cws2fws.c

…

enum_options.c

Reinstate proper FFmpeg license for all files.

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

ffescape.c

…

ffeval.c

tools/ffeval: Check return value of av_expr_parse_and_eval()

2013-06-02 22:48:03 +02:00

ffhash.c

ffhash: Change size to an int

2013-09-24 16:29:18 +02:00

fourcc2pixfmt.c

replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*

2013-05-15 11:23:14 +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 remote-tracking branch 'qatar/master'

2013-10-05 11:35:39 +02:00

make_chlayout_test

…

missing_codec_desc

…

normalize.py

…

patcheck

tools/patcheck: fix misdetection with stuff like const_names

2013-05-23 19:11:28 +02:00

pktdumper.c

Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

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

plotframes

…

probetest.c

tools/probetest: Check av_realloc() return code

2013-12-11 22:29:22 +01:00

qt-faststart.c

Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'

2014-03-01 13:47:08 +01:00

seek_print.c

tools: Fix apparent merge failure

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

trasher.c

…

uncoded_frame.c

tools/uncoded_frame: fix double free

2014-02-13 01:29:01 +01:00

unwrap-diff

…

yuvcmp.c

…

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