diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-28 22:10:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 22:19:43 +0100 |
| commit | bb56436cfda8ebdac5fcef9194fea64fd7b86b6a (patch) | |
| tree | 7fb51aac3c341bb6bce54f0dac8b13bdc278acdf /libavfilter | |
| parent | eb1424b4fef287f2cdb5e66254d693c4e2304659 (diff) | |
| download | ffmpeg-bb56436cfda8ebdac5fcef9194fea64fd7b86b6a.tar.gz | |
f_settb: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/f_settb.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/libavfilter/f_settb.c b/libavfilter/f_settb.c index 01bc1aae0e..5b9434ef82 100644 --- a/libavfilter/f_settb.c +++ b/libavfilter/f_settb.c @@ -103,37 +103,20 @@ static int config_output_props(AVFilterLink *outlink) return 0; } -static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) +static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; if (av_cmp_q(inlink->time_base, outlink->time_base)) { - int64_t orig_pts = picref->pts; - picref->pts = av_rescale_q(picref->pts, inlink->time_base, outlink->time_base); + int64_t orig_pts = frame->pts; + frame->pts = av_rescale_q(frame->pts, inlink->time_base, outlink->time_base); av_log(ctx, AV_LOG_DEBUG, "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n", inlink ->time_base.num, inlink ->time_base.den, orig_pts, - outlink->time_base.num, outlink->time_base.den, picref->pts); + outlink->time_base.num, outlink->time_base.den, frame->pts); } - inlink->cur_buf = NULL; - return ff_start_frame(outlink, picref); -} - -static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *samplesref) -{ - AVFilterContext *ctx = inlink->dst; - AVFilterLink *outlink = ctx->outputs[0]; - - if (av_cmp_q(inlink->time_base, outlink->time_base)) { - int64_t orig_pts = samplesref->pts; - samplesref->pts = av_rescale_q(samplesref->pts, inlink->time_base, outlink->time_base); - av_log(ctx, AV_LOG_DEBUG, "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n", - inlink ->time_base.num, inlink ->time_base.den, orig_pts, - outlink->time_base.num, outlink->time_base.den, samplesref->pts); - } - - return ff_filter_frame(outlink, samplesref); + return ff_filter_frame(outlink, frame); } #if CONFIG_SETTB_FILTER @@ -142,8 +125,7 @@ static const AVFilterPad avfilter_vf_settb_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = start_frame, - .end_frame = ff_null_end_frame + .filter_frame = filter_frame, }, { NULL } }; |