aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-08 21:59:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-08 23:55:06 +0200
commit1e1015f330e399ed199e58bd0dbf57f9589c5cc4 (patch)
treec96cc324235ca806c6a1000d53e28fbd06f1b0d2
parentdf9f9caba58aeac461abb1232b46adbd93df7ed2 (diff)
downloadffmpeg-1e1015f330e399ed199e58bd0dbf57f9589c5cc4.tar.gz
avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/af_apad.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c
index 66738f6ae6..265b76a38d 100644
--- a/libavfilter/af_apad.c
+++ b/libavfilter/af_apad.c
@@ -89,7 +89,7 @@ static int request_frame(AVFilterLink *outlink)
ret = ff_request_frame(ctx->inputs[0]);
- if (ret == AVERROR_EOF) {
+ if (ret == AVERROR_EOF && !ctx->is_disabled) {
int n_out = apad->packet_size;
AVFrame *outsamplesref;
@@ -131,6 +131,7 @@ static const AVFilterPad apad_inputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.filter_frame = filter_frame,
+ .passthrough_filter_frame = filter_frame,
},
{ NULL },
};
@@ -152,4 +153,5 @@ AVFilter avfilter_af_apad = {
.inputs = apad_inputs,
.outputs = apad_outputs,
.priv_class = &apad_class,
+ .flags = AVFILTER_FLAG_SUPPORT_TIMELINE,
};