mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '00fd914d4912322212e924c15f325cebf2fde8d3'
* commit '00fd914d4912322212e924c15f325cebf2fde8d3': hevcdec: set the active SPS before calling get_format() Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
7762942045
|
@ -503,13 +503,14 @@ static int hls_slice_header(HEVCContext *s)
|
||||||
}
|
}
|
||||||
ff_hevc_clear_refs(s);
|
ff_hevc_clear_refs(s);
|
||||||
|
|
||||||
|
ret = set_sps(s, sps, sps->pix_fmt);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
pix_fmt = get_format(s, sps);
|
pix_fmt = get_format(s, sps);
|
||||||
if (pix_fmt < 0)
|
if (pix_fmt < 0)
|
||||||
return pix_fmt;
|
return pix_fmt;
|
||||||
|
s->avctx->pix_fmt = pix_fmt;
|
||||||
ret = set_sps(s, sps, pix_fmt);
|
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
s->seq_decode = (s->seq_decode + 1) & 0xff;
|
s->seq_decode = (s->seq_decode + 1) & 0xff;
|
||||||
s->max_ra = INT_MAX;
|
s->max_ra = INT_MAX;
|
||||||
|
|
Loading…
Reference in New Issue