Changeset ae4f6379 in ffmpeg


Ignore:
Timestamp:
Feb 25, 2021, 10:43:56 AM (4 years ago)
Author:
Paul B Mahol <onemda@gmail.com>
Branches:
master
Children:
9e4225cf
Parents:
ac6dd87c
git-author:
Guo, Yejun <yejun.guo@intel.com> (02/25/21 06:38:12)
git-committer:
Paul B Mahol <onemda@gmail.com> (02/25/21 10:43:56)
Message:

avfilter/vf_vif.c: fix build warning for [-Wmain]

src/libavfilter/vf_vif.c: In function ‘process_frame’:
src/libavfilter/vf_vif.c:542:20: warning: ‘main’ is usually a function [-Wmain]

AVFrame *out, *main = NULL, *ref = NULL;

~

Signed-off-by: Guo, Yejun <yejun.guo@intel.com>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libavfilter/vf_vif.c

    rac6dd87c rae4f6379  
    540540    VIFContext *s = fs->opaque;
    541541    AVFilterLink *outlink = ctx->outputs[0];
    542     AVFrame *out, *main = NULL, *ref = NULL;
     542    AVFrame *out_frame, *main_frame = NULL, *ref_frame = NULL;
    543543    int ret;
    544544
    545     ret = ff_framesync_dualinput_get(fs, &main, &ref);
     545    ret = ff_framesync_dualinput_get(fs, &main_frame, &ref_frame);
    546546    if (ret < 0)
    547547        return ret;
    548548
    549     if (ctx->is_disabled || !ref) {
    550         out = main;
     549    if (ctx->is_disabled || !ref_frame) {
     550        out_frame = main_frame;
    551551    } else {
    552         out = do_vif(ctx, main, ref);
    553     }
    554 
    555     out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base);
    556 
    557     return ff_filter_frame(outlink, out);
     552        out_frame = do_vif(ctx, main_frame, ref_frame);
     553    }
     554
     555    out_frame->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base);
     556
     557    return ff_filter_frame(outlink, out_frame);
    558558}
    559559
Note: See TracChangeset for help on using the changeset viewer.