[FFmpeg-cvslog] avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 21:59:28 2013 +0200| [1e1015f330e399ed199e58bd0dbf57f9589c5cc4] | committer: Michael Niedermayer

avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e1015f330e399ed199e58bd0dbf57f9589c5cc4
---

 libavfilter/af_apad.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c
index 66738f6..265b76a 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,
 };