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
..
2012-10-08 11:22:42 +02:00
2013-04-11 22:13:45 +02:00
2013-04-10 12:09:20 +02:00
2013-03-31 22:34:13 +02:00
2013-03-22 09:20:45 +01:00
2013-04-11 22:13:45 +02:00
2013-04-03 21:07:15 +02:00
2012-01-28 11:04:19 +01:00
2013-01-21 10:24:45 +00:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2013-02-14 23:45:48 +01:00
2012-12-21 00:18:34 +01:00