The commit has already been split and commited, this merge is just for metadata. What has not been merged is the removial of some start/end_frame / draw_slice related functions that are still in use. They can be removed once they are unused. * commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666': lavfi: merge start_frame/draw_slice/end_frame
Unified · Split
| @@ -35,6 +35,7 @@ · 34 unmodified lines | |||
| 35 | 35 | ||
| 36 | #include "audio.h" | 36 | #include "audio.h" |
| 37 | #include "avfilter.h" | 37 | #include "avfilter.h" |
| 38 | #include "internal.h" | ||
| 38 | 39 | ||
| 39 | typedef struct AShowInfoContext { | 40 | typedef struct AShowInfoContext { |
| 40 | /** | 41 | /** |
| @@ -23,9 +23,12 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/avstring.h" | 23 | #include "libavutil/avstring.h" |
| 24 | #include "libavutil/channel_layout.h" | 24 | #include "libavutil/channel_layout.h" |
| 25 | #include "libavutil/common.h" | 25 | #include "libavutil/common.h" |
| 26 | #include "libavutil/imgutils.h" | ||
| 26 | #include "libavutil/pixdesc.h" | 27 | #include "libavutil/pixdesc.h" |
| 27 | #include "libavutil/rational.h" | 28 | #include "libavutil/rational.h" |
| 29 | #include "libavutil/samplefmt.h" | ||
| 28 | 30 | ||
| 31 | #include "audio.h" | ||
| 29 | #include "avfilter.h" | 32 | #include "avfilter.h" |
| 30 | #include "formats.h" | 33 | #include "formats.h" |
| 31 | #include "internal.h" | 34 | #include "internal.h" |