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

         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;
+        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
         link->cur_pic = picref;

     if(out) {
         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));
     }
 }

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

Keyboard shortcuts