Use avfilter_copy_picref_props() along lavfi.

Originally committed as revision 24196 to svn://svn.ffmpeg.org/ffmpeg/trunk

Víctor Paesa committed 16 years ago

Commit 922189f1 parent e9e40c83 files · +3 −14Browse files

Unified · Split

3 files

libavfilter/avfilter.c +1 −5
libavfilter/defaults.c +1 −5
libavfilter/vf_scale.c +1 −4

libavfilter/avfilter.c+1−5

@@ -263,11 +263,7 @@ void avfilter_start_frame(AVFilterLink link, AVFilterPicRef picref) · 262 unmodified lines
263	263
264	264	link->cur_pic = avfilter_default_get_video_buffer(link, dst->min_perms, link->w, link->h);
265	265	link->srcpic = picref;
266		− link->cur_pic->pts = link->srcpic->pts;
267		− link->cur_pic->pos = link->srcpic->pos;
268		− link->cur_pic->pixel_aspect = link->srcpic->pixel_aspect;
269		− link->cur_pic->interlaced = link->srcpic->interlaced;
270		− link->cur_pic->top_field_first = link->srcpic->top_field_first;
	266	+ avfilter_copy_picref_props(link->cur_pic, link->srcpic);
271	267	}
272	268	else
273	269	link->cur_pic = picref;

libavfilter/defaults.c+1−5

@@ -74,11 +74,7 @@ void avfilter_default_start_frame(AVFilterLink link, AVFilterPicRef picref) · 73 unmodified lines
74	74
75	75	if(out) {
76	76	out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
77		− out->outpic->pts = picref->pts;
78		− out->outpic->pos = picref->pos;
79		− out->outpic->pixel_aspect = picref->pixel_aspect;
80		− out->outpic->interlaced = picref->interlaced;
81		− out->outpic->top_field_first = picref->top_field_first;
	77	+ avfilter_copy_picref_props(out->outpic, picref);
82	78	avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0));
83	79	}
84	80	}

libavfilter/vf_scale.c+1−4

@@ -152,10 +152,7 @@ static void start_frame(AVFilterLink link, AVFilterPicRef picref) · 151 unmodified lines
152	152	scale->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
153	153
154	154	outpicref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
155		− outpicref->pts = picref->pts;
156		− outpicref->pos = picref->pos;
157		− outpicref->interlaced = picref->interlaced;
158		− outpicref->top_field_first = picref->top_field_first;
	155	+ avfilter_copy_picref_props(outpicref, picref);
159	156
160	157	outlink->outpic = outpicref;
161	158