diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-05-07 17:53:29 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-05-07 17:53:29 +0000 |
| commit | f66b390582bc3760770461b4332b34c2b283dbf6 (patch) | |
| tree | ed67d8f170ceb7c6dd17c4026e0ff25df86364d4 | |
| parent | a0aa73544c14fee6853822d5c28d522aca3486ae (diff) | |
| download | ffmpeg-f66b390582bc3760770461b4332b34c2b283dbf6.tar.gz | |
vf_pad: fix mixed code and declarations
Originally committed as revision 23054 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavfilter/vf_pad.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index fbe6606e36..072a747c85 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -200,8 +200,9 @@ static AVFilterPicRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, AVFilterPicRef *picref = avfilter_get_video_buffer(inlink->dst->outputs[0], perms, w + (pad->w - pad->in_w), h + (pad->h - pad->in_h)); + int plane; - for (int plane = 0; plane < 4 && picref->data[plane]; plane++) { + for (plane = 0; plane < 4 && picref->data[plane]; plane++) { int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0; int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0; @@ -216,9 +217,11 @@ static void start_frame(AVFilterLink *inlink, AVFilterPicRef *inpicref) { PadContext *pad = inlink->dst->priv; AVFilterPicRef *outpicref = avfilter_ref_pic(inpicref, ~0); + int plane; + inlink->dst->outputs[0]->outpic = outpicref; - for (int plane = 0; plane < 4 && outpicref->data[plane]; plane++) { + for (plane = 0; plane < 4 && outpicref->data[plane]; plane++) { int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0; int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0; |