diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 13:53:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 16:43:34 +0100 |
| commit | cd7febd33f20b42aac14cf9cb87efdf619b39b0a (patch) | |
| tree | 6826129a1f327836e1c980449b2fa7308307b615 /libavfilter/avf_concat.c | |
| parent | 16af29a7a6deff3f6081fca1e36ad96cf8fec77d (diff) | |
| download | ffmpeg-cd7febd33f20b42aac14cf9cb87efdf619b39b0a.tar.gz | |
lavfi: replace filter_samples by filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avf_concat.c')
| -rw-r--r-- | libavfilter/avf_concat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 8812c9ebb2..22171c4b42 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -185,7 +185,7 @@ static void push_frame(AVFilterContext *ctx, unsigned in_no, ff_end_frame(outlink); break; case AVMEDIA_TYPE_AUDIO: - ff_filter_samples(outlink, buf); + ff_filter_frame(outlink, buf); break; } } @@ -244,7 +244,7 @@ static int end_frame(AVFilterLink *inlink) return 0; } -static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf) +static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) { process_frame(inlink, buf); return 0; /* enhancement: handle error return */ @@ -297,7 +297,7 @@ static void send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no) av_samples_set_silence(buf->extended_data, 0, frame_nb_samples, nb_channels, outlink->format); buf->pts = base_pts + av_rescale_q(sent, rate_tb, outlink->time_base); - ff_filter_samples(outlink, buf); + ff_filter_frame(outlink, buf); sent += frame_nb_samples; nb_samples -= frame_nb_samples; } @@ -397,7 +397,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args) pad.draw_slice = draw_slice; pad.end_frame = end_frame; } else { - pad.filter_samples = filter_samples; + pad.filter_frame = filter_frame; } ff_insert_inpad(ctx, ctx->nb_inputs, &pad); } |