virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

lavfi/vidstabdetect: fix direct path.

Browse Source 
The frame must be writable if the show option is set, otherwise pass the
frame unchanged.
This commit is contained in:
Clément Bœsch
2013-04-24 17:55:55 +02:00
parent c82f6e58da
commit c7d2a3abf0
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libavfilter/vf_vidstabdetect.c
View File

@@ -160,22 +160,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
LocalMotions localmotions; LocalMotions localmotions;
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
int direct = 0;
AVFrame *out;
VSFrame frame; VSFrame frame;
int plane; int plane;
if (av_frame_is_writable(in)) { if (sd->conf.show > 0 && !av_frame_is_writable(in))
direct = 1; av_frame_make_writable(in);
out = in;
} else {
out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
}
av_frame_copy_props(out, in);
}
for (plane = 0; plane < md->fi.planes; plane++) { for (plane = 0; plane < md->fi.planes; plane++) {
frame.data[plane] = in->data[plane]; frame.data[plane] = in->data[plane];
@@ -191,16 +180,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
} }
vs_vector_del(&localmotions); vs_vector_del(&localmotions);
} }
if (sd->conf.show > 0 && !direct) {
av_image_copy(out->data, out->linesize,
(void*)in->data, in->linesize,
in->format, in->width, in->height);
}
if (!direct) return ff_filter_frame(outlink, in);
av_frame_free(&in);
return ff_filter_frame(outlink, out);
} }
static const AVFilterPad avfilter_vf_vidstabdetect_inputs[] = { static const AVFilterPad avfilter_vf_vidstabdetect_inputs[] = {