har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_stack: always copy SAR from first input

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-12-02 23:29:49 +01:00
parent 00d454ed2c
commit 225341b20d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/vf_stack.c
View File

@ -105,6 +105,7 @@ static int process_frame(FFFrameSync *fs)
if (!out) if (!out)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base);
out->sample_aspect_ratio = outlink->sample_aspect_ratio;
for (i = 0; i < s->nb_inputs; i++) { for (i = 0; i < s->nb_inputs; i++) {
AVFilterLink *inlink = ctx->inputs[i]; AVFilterLink *inlink = ctx->inputs[i];
@ -147,6 +148,7 @@ static int config_output(AVFilterLink *outlink)
StackContext *s = ctx->priv; StackContext *s = ctx->priv;
AVRational time_base = ctx->inputs[0]->time_base; AVRational time_base = ctx->inputs[0]->time_base;
AVRational frame_rate = ctx->inputs[0]->frame_rate; AVRational frame_rate = ctx->inputs[0]->frame_rate;
AVRational sar = ctx->inputs[0]->sample_aspect_ratio;
int height = ctx->inputs[0]->h; int height = ctx->inputs[0]->h;
int width = ctx->inputs[0]->w; int width = ctx->inputs[0]->w;
FFFrameSyncIn *in; FFFrameSyncIn *in;
@ -179,6 +181,7 @@ static int config_output(AVFilterLink *outlink)
outlink->h = height; outlink->h = height;
outlink->time_base = time_base; outlink->time_base = time_base;
outlink->frame_rate = frame_rate; outlink->frame_rate = frame_rate;
outlink->sample_aspect_ratio = sar;
if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0) if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0)
return ret; return ret;