diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 02:37:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 02:51:22 +0100 |
| commit | 87b9dc098240e72c8874e2d3a75e954cd56dc776 (patch) | |
| tree | 2159b5f0e566ee0719ceeea412c24baedbad3402 | |
| parent | 031d6448782ba9993745f5cabf0c7cb32dfdb97c (diff) | |
| parent | 565e4993c63f797e2d50ad2f1e8f62fdbe299666 (diff) | |
Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'
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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/af_ashowinfo.c | 1 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 4692d99988..7e7543f672 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -35,6 +35,7 @@ #include "audio.h" #include "avfilter.h" +#include "internal.h" typedef struct AShowInfoContext { /** diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6779777b7d..31580f6175 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -23,9 +23,12 @@ #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" +#include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "libavutil/rational.h" +#include "libavutil/samplefmt.h" +#include "audio.h" #include "avfilter.h" #include "formats.h" #include "internal.h" |