Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 21:40:41 +0000 (23:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 21:50:39 +0000 (23:50 +0200)
commit231fd4411ff35762cb82145c9bebc2dd1db191e0
tree053e96f54c1d5ad892d0546b5260f6c32cf329b1
parent9110f95985a0860ba7707cb57524a756c74551e3
parent38f0c0781a6e099f11c0acec07f9b8be742190c4
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>
13 files changed:
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
tools/graph2dot.c