Michael Niedermayer 231fd4411f Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' ...

* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
  lavfi: merge avfiltergraph.h into avfilter.h

Conflicts:
	doc/APIchanges
	ffmpeg_filter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.h
	libavfilter/version.h
	tools/graph2dot.c

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

2013-04-11 23:50:39 +02:00

..

aviocat.c

Replace usleep() calls with av_usleep()

2012-06-22 17:15:36 +01: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

Merge remote-tracking branch 'hexene/stagefright'

2012-04-19 01:58:30 +02:00

clean-diff

…

cws2fws.c

cws2fws: check fstat return code.

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

enum_options.c

…

ffescape.c

lavu: add escape API

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

ffeval.c

tools/ffeval: do not use UNIX-specific /dev/std{in,out} files

2012-10-16 13:51:44 +02:00

fourcc2pixfmt.c

fourcc2pixfmt: fix compilation

2012-10-24 22:25:43 +02:00

graph2dot.c

Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'

2013-04-11 23:50:39 +02:00

ismindex.c

Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'

2013-03-14 12:15:02 +01:00

make_chlayout_test

tools: add make_chlayout_test perl script.

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

missing_codec_desc

tools: add a script to find missing codec descriptors.

2012-08-13 10:44:59 +02:00

normalize.py

tools: add audio normalize script example.

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

patcheck

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

pktdumper.c

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

plotframes

tools: add plotframes script

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

probetest.c

probetest: fix possible use of uninitialized data

2012-10-31 13:16:52 +01:00

qt-faststart.c

qt-faststart: Check offset_count

2012-12-13 15:07:20 +01:00

seek_print.c

Replace all occurrences of PRI in sscanf() calls with SCN

2013-04-10 09:56:48 +02:00

trasher.c

trasher: check seek return value.

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

unwrap-diff

…

yuvcmp.c

Remove mt-work directory

2012-09-15 15:40:36 -04:00