From 5d4890d73d77a75bd3bbb3e469de32da71742726 Mon Sep 17 00:00:00 2001 From: "S.N. Hemanth Meenakshisundaram" Date: Sat, 7 Aug 2010 01:15:34 +0000 Subject: Rename fields: AVFilterLink.srcpic -> AVFilterLink.src_buf AVFilterLink.cur_pic -> AVFilterLink.cur_buf AVFilterLink.outpic -> AVFilterLink.out_buf The new names are more generic and more consistent, since the struct they contain, which was named AVFilterPicRef, has been renamed to AVFilterBufferRef. Patch by S.N. Hemanth Meenakshisundaram %smeenaks%ucsd%edu%. Originally committed as revision 24732 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/vf_scale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavfilter/vf_scale.c') diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 3dd02fe2c2..c45443fee2 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -154,7 +154,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref) outpicref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); avfilter_copy_buffer_ref_props(outpicref, picref); - outlink->outpic = outpicref; + outlink->out_buf = outpicref; av_reduce(&outpicref->pixel_aspect.num, &outpicref->pixel_aspect.den, (int64_t)picref->pixel_aspect.num * outlink->h * link->w, @@ -169,7 +169,7 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { ScaleContext *scale = link->dst->priv; int out_h; - AVFilterBufferRef *cur_pic = link->cur_pic; + AVFilterBufferRef *cur_pic = link->cur_buf; const uint8_t *data[4]; if (scale->slice_y == 0 && slice_dir == -1) @@ -183,8 +183,8 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) data[3] = cur_pic->data[3] + y * cur_pic->linesize[3]; out_h = sws_scale(scale->sws, data, cur_pic->linesize, y, h, - link->dst->outputs[0]->outpic->data, - link->dst->outputs[0]->outpic->linesize); + link->dst->outputs[0]->out_buf->data, + link->dst->outputs[0]->out_buf->linesize); if (slice_dir == -1) scale->slice_y -= out_h; -- cgit v1.2.3