diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:40:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:50:39 +0200 |
| commit | 231fd4411ff35762cb82145c9bebc2dd1db191e0 (patch) | |
| tree | 053e96f54c1d5ad892d0546b5260f6c32cf329b1 /ffmpeg.c | |
| parent | 9110f95985a0860ba7707cb57524a756c74551e3 (diff) | |
| parent | 38f0c0781a6e099f11c0acec07f9b8be742190c4 (diff) | |
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 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -64,7 +64,6 @@ # include "libavfilter/avcodec.h" # include "libavfilter/avfilter.h" -# include "libavfilter/avfiltergraph.h" # include "libavfilter/buffersrc.h" # include "libavfilter/buffersink.h" |