aboutsummaryrefslogtreecommitdiffstats
path: root/doc/libavformat.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-11 23:40:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-11 23:50:39 +0200
commit231fd4411ff35762cb82145c9bebc2dd1db191e0 (patch)
tree053e96f54c1d5ad892d0546b5260f6c32cf329b1 /doc/libavformat.texi
parent9110f95985a0860ba7707cb57524a756c74551e3 (diff)
parent38f0c0781a6e099f11c0acec07f9b8be742190c4 (diff)
downloadffmpeg-231fd4411ff35762cb82145c9bebc2dd1db191e0.tar.gz
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>
Diffstat (limited to 'doc/libavformat.texi')
0 files changed, 0 insertions, 0 deletions