From 922189feb065bc0c7aaa87146ad4d43b6e528b7b Mon Sep 17 00:00:00 2001 From: Víctor Paesa Date: Sun, 11 Jul 2010 14:44:43 +0000 Subject: Use avfilter_copy_picref_props() along lavfi. Originally committed as revision 24196 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/avfilter.c | 6 +----- libavfilter/defaults.c | 6 +----- libavfilter/vf_scale.c | 5 +---- 3 files changed, 3 insertions(+), 14 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 38ca3b1e91..f442cdc3b4 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -263,11 +263,7 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref) link->cur_pic = avfilter_default_get_video_buffer(link, dst->min_perms, link->w, link->h); link->srcpic = picref; - link->cur_pic->pts = link->srcpic->pts; - link->cur_pic->pos = link->srcpic->pos; - link->cur_pic->pixel_aspect = link->srcpic->pixel_aspect; - link->cur_pic->interlaced = link->srcpic->interlaced; - link->cur_pic->top_field_first = link->srcpic->top_field_first; + avfilter_copy_picref_props(link->cur_pic, link->srcpic); } else link->cur_pic = picref; diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 0ac88f85e2..f53ec2472a 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -74,11 +74,7 @@ void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref) if(out) { out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h); - out->outpic->pts = picref->pts; - out->outpic->pos = picref->pos; - out->outpic->pixel_aspect = picref->pixel_aspect; - out->outpic->interlaced = picref->interlaced; - out->outpic->top_field_first = picref->top_field_first; + avfilter_copy_picref_props(out->outpic, picref); avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0)); } } diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 18c8881334..ebbc575328 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -152,10 +152,7 @@ static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) scale->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h; outpicref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); - outpicref->pts = picref->pts; - outpicref->pos = picref->pos; - outpicref->interlaced = picref->interlaced; - outpicref->top_field_first = picref->top_field_first; + avfilter_copy_picref_props(outpicref, picref); outlink->outpic = outpicref; -- cgit v1.2.3