RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_zscale: fix regression with src/dst_format initialization

This commit is contained in:
Paul B Mahol 2022-03-28 12:39:05 +02:00
parent 1291568c98
commit e5189b1382
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_zscale.c
View File

@ -113,6 +113,7 @@ typedef struct ZScaleContext {
int in_h_chr_pos; int in_h_chr_pos;
int in_v_chr_pos; int in_v_chr_pos;
int first_time;
int force_original_aspect_ratio; int force_original_aspect_ratio;
void *tmp[MAX_THREADS]; //separate for each thread; void *tmp[MAX_THREADS]; //separate for each thread;
@ -321,12 +322,7 @@ static int config_props(AVFilterLink *outlink)
outlink->w = w; outlink->w = w;
outlink->h = h; outlink->h = h;
if (inlink->w == outlink->w && s->first_time = 1;
inlink->h == outlink->h &&
inlink->format == outlink->format)
;
else {
}
if (inlink->sample_aspect_ratio.num){ if (inlink->sample_aspect_ratio.num){
outlink->sample_aspect_ratio = av_mul_q((AVRational){outlink->h * inlink->w, outlink->w * inlink->h}, inlink->sample_aspect_ratio); outlink->sample_aspect_ratio = av_mul_q((AVRational){outlink->h * inlink->w, outlink->w * inlink->h}, inlink->sample_aspect_ratio);
@ -770,6 +766,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
if ((link->format != outlink->format) || if ((link->format != outlink->format) ||
(link->w != outlink->w) || (link->w != outlink->w) ||
(link->h != outlink->h) || (link->h != outlink->h) ||
s->first_time ||
(s->src_format.chroma_location != s->dst_format.chroma_location) || (s->src_format.chroma_location != s->dst_format.chroma_location) ||
(s->src_format.color_family !=s->dst_format.color_family) || (s->src_format.color_family !=s->dst_format.color_family) ||
(s->src_format.color_primaries !=s->dst_format.color_primaries) || (s->src_format.color_primaries !=s->dst_format.color_primaries) ||
@ -821,6 +818,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
s->primaries_in, s->trc_in, s->range_in, s->chromal_in); s->primaries_in, s->trc_in, s->range_in, s->chromal_in);
format_init(&s->dst_format, out, odesc, s->colorspace, format_init(&s->dst_format, out, odesc, s->colorspace,
s->primaries, s->trc, s->range, s->chromal); s->primaries, s->trc, s->range, s->chromal);
s->first_time = 0;
s->params.dither_type = s->dither; s->params.dither_type = s->dither;
s->params.cpu_type = ZIMG_CPU_AUTO; s->params.cpu_type = ZIMG_CPU_AUTO;