Commit 18156b53 authored by Anton Khirnov's avatar Anton Khirnov

hevc: do not pass an entire HEVCContext into export_stream_params()

It only needs the parameter sets.
parent 650060df
...@@ -383,10 +383,10 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb) ...@@ -383,10 +383,10 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb)
return 0; return 0;
} }
static void export_stream_params(AVCodecContext *avctx, static void export_stream_params(AVCodecContext *avctx, const HEVCParamSets *ps,
const HEVCContext *s, const HEVCSPS *sps) const HEVCSPS *sps)
{ {
const HEVCVPS *vps = (const HEVCVPS*)s->ps.vps_list[sps->vps_id]->data; const HEVCVPS *vps = (const HEVCVPS*)ps->vps_list[sps->vps_id]->data;
unsigned int num = 0, den = 0; unsigned int num = 0, den = 0;
avctx->pix_fmt = sps->pix_fmt; avctx->pix_fmt = sps->pix_fmt;
...@@ -435,7 +435,7 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps) ...@@ -435,7 +435,7 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps)
enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts;
int ret; int ret;
export_stream_params(s->avctx, s, sps); export_stream_params(s->avctx, &s->ps, sps);
pic_arrays_free(s); pic_arrays_free(s);
ret = pic_arrays_init(s, sps); ret = pic_arrays_init(s, sps);
...@@ -3017,7 +3017,7 @@ static int hevc_decode_extradata(HEVCContext *s) ...@@ -3017,7 +3017,7 @@ static int hevc_decode_extradata(HEVCContext *s)
for (i = 0; i < FF_ARRAY_ELEMS(s->ps.sps_list); i++) { for (i = 0; i < FF_ARRAY_ELEMS(s->ps.sps_list); i++) {
if (s->ps.sps_list[i]) { if (s->ps.sps_list[i]) {
const HEVCSPS *sps = (const HEVCSPS*)s->ps.sps_list[i]->data; const HEVCSPS *sps = (const HEVCSPS*)s->ps.sps_list[i]->data;
export_stream_params(s->avctx, s, sps); export_stream_params(s->avctx, &s->ps, sps);
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment