* 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
Showing the changes to libavfilter/avfiltergraph.c (1 of 13 files). Show all
Unified · Split
| @@ -30,7 +30,6 @@ · 29 unmodified lines | |||
| 30 | #include "libavutil/pixdesc.h" | 30 | #include "libavutil/pixdesc.h" |
| 31 | #include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2() | 31 | #include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2() |
| 32 | #include "avfilter.h" | 32 | #include "avfilter.h" |
| 33 | #include "avfiltergraph.h" | ||
| 34 | #include "formats.h" | 33 | #include "formats.h" |
| 35 | #include "internal.h" | 34 | #include "internal.h" |
| 36 | 35 | ||