Michael Niedermayer ecade984ac Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf' ...

* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
  avfiltergraph: replace AVFilterGraph.filter_count with nb_filters

Conflicts:
	doc/APIchanges
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/graphparser.c
	libavfilter/version.h

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

2013-03-16 16:09:37 +01: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 '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

2013-03-16 16:09:37 +01:00

ismindex.c

Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'

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

make_chlayout_test

…

missing_codec_desc

…

patcheck

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

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

pktdumper.c

…

plotframes

tools: add plotframes script

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

probetest.c

…

qt-faststart.c

…

seek_print.c

tools: add seek_print.

2013-02-24 13:12:46 +01:00

trasher.c

…

unwrap-diff

…

yuvcmp.c

…