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

…

bisect-create

…

bookmarklets.html

…

build_libstagefright

…

clean-diff

…

cws2fws.c

…

enum_options.c

…

ffescape.c

lavu: add escape API

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

ffeval.c

…

fourcc2pixfmt.c

…

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

…

missing_codec_desc

…

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

…

plotframes

…

probetest.c

…

qt-faststart.c

…

seek_print.c

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

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

trasher.c

…

unwrap-diff

…

yuvcmp.c

…