Use avfilter_copy_picref_props() along lavfi.

Originally committed as revision 24196 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Víctor Paesa 2010-07-11 14:44:43 +00:00
parent e9e40c875e
commit 922189feb0
3 changed files with 3 additions and 14 deletions

View File

@ -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->cur_pic = avfilter_default_get_video_buffer(link, dst->min_perms, link->w, link->h);
link->srcpic = picref; link->srcpic = picref;
link->cur_pic->pts = link->srcpic->pts; avfilter_copy_picref_props(link->cur_pic, link->srcpic);
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;
} }
else else
link->cur_pic = picref; link->cur_pic = picref;

View File

@ -74,11 +74,7 @@ void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
if(out) { if(out) {
out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h); out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
out->outpic->pts = picref->pts; avfilter_copy_picref_props(out->outpic, picref);
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_start_frame(out, avfilter_ref_pic(out->outpic, ~0)); avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0));
} }
} }

View File

@ -152,10 +152,7 @@ static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
scale->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h; 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 = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
outpicref->pts = picref->pts; avfilter_copy_picref_props(outpicref, picref);
outpicref->pos = picref->pos;
outpicref->interlaced = picref->interlaced;
outpicref->top_field_first = picref->top_field_first;
outlink->outpic = outpicref; outlink->outpic = outpicref;