Commited in SoC by Bobby Bingham on 2007-07-14 17:34:04 Originally committed as revision 11986 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -46,14 +46,14 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms) · 45 unmodified lines | |||
| 46 | AVFilterPic *pic = av_mallocz(sizeof(AVFilterPic)); | 46 | AVFilterPic *pic = av_mallocz(sizeof(AVFilterPic)); |
| 47 | AVFilterPicRef *ref = av_mallocz(sizeof(AVFilterPicRef)); | 47 | AVFilterPicRef *ref = av_mallocz(sizeof(AVFilterPicRef)); |
| 48 | 48 | ||
| 49 | ref->pic = pic; | 49 | ref->pic = pic; |
| 50 | ref->w = link->w; | 50 | ref->w = link->w; |
| 51 | ref->h = link->h; | 51 | ref->h = link->h; |
| 52 | ref->perms = perms; | 52 | ref->perms = perms; |
| 53 | 53 | ||
| 54 | pic->refcount = 1; | 54 | pic->refcount = 1; |
| 55 | pic->format = link->format; | 55 | pic->format = link->format; |
| 56 | pic->free = avfilter_default_free_video_buffer; | 56 | pic->free = avfilter_default_free_video_buffer; |
| 57 | avpicture_alloc((AVPicture *)pic, pic->format, ref->w, ref->h); | 57 | avpicture_alloc((AVPicture *)pic, pic->format, ref->w, ref->h); |
| 58 | 58 | ||
| 59 | memcpy(ref->data, pic->data, sizeof(pic->data)); | 59 | memcpy(ref->data, pic->data, sizeof(pic->data)); |
| @@ -69,7 +69,7 @@ void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref) · 9 unmodified lines | |||
| 69 | link->cur_pic = picref; | 69 | link->cur_pic = picref; |
| 70 | 70 | ||
| 71 | if(out) { | 71 | if(out) { |
| 72 | out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE); | 72 | out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE); |
| 73 | out->outpic->pts = picref->pts; | 73 | out->outpic->pts = picref->pts; |
| 74 | avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0)); | 74 | avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0)); |
| 75 | } | 75 | } |
| @@ -136,10 +136,10 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, · 60 unmodified lines | |||
| 136 | src->outputs[srcpad] = | 136 | src->outputs[srcpad] = |
| 137 | dst->inputs[dstpad] = link = av_malloc(sizeof(AVFilterLink)); | 137 | dst->inputs[dstpad] = link = av_malloc(sizeof(AVFilterLink)); |
| 138 | 138 | ||
| 139 | link->src = src; | 139 | link->src = src; |
| 140 | link->dst = dst; | 140 | link->dst = dst; |
| 141 | link->srcpad = srcpad; | 141 | link->srcpad = srcpad; |
| 142 | link->dstpad = dstpad; | 142 | link->dstpad = dstpad; |
| 143 | link->cur_pic = NULL; | 143 | link->cur_pic = NULL; |
| 144 | 144 | ||
| 145 | /* find a format both filters support - TODO: auto-insert conversion filter */ | 145 | /* find a format both filters support - TODO: auto-insert conversion filter */ |