@@ -2497,7 +2497,7 @@ static void hls_decode_neighbour(HEVCLocalContext *lc, int x_ctb, int y_ctb,
lc->ctb_up_left_flag = ((x_ctb > 0) && (y_ctb > 0) && (ctb_addr_in_slice-1 >= s->ps.sps->ctb_width) && (s->ps.pps->tile_id[ctb_addr_ts] == s->ps.pps->tile_id[s->ps.pps->ctb_addr_rs_to_ts[ctb_addr_rs-1 - s->ps.sps->ctb_width]]));
}
-static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread)
+static int hls_decode_entry(AVCodecContext *avctxt, void *arg)
{
HEVCContext *s = avctxt->priv_data;
HEVCLocalContext *const lc = s->HEVClc;
@@ -2561,14 +2561,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread)
static int hls_slice_data(HEVCContext *s)
{
- int arg[2];
- int ret[2];
+ int ret = 0;
- arg[0] = 0;
- arg[1] = 1;
-
- s->avctx->execute(s->avctx, hls_decode_entry, arg, ret , 1, sizeof(int));
- return ret[0];
+ s->avctx->execute(s->avctx, hls_decode_entry, NULL, &ret , 1, 0);
+ return ret;
}
static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *hevc_lclist,
int job, int self_id)
From: Zhao Zhili <zhilizhao@tencent.com> --- libavcodec/hevcdec.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)