Commit 179ae53f authored by Mans Rullgard's avatar Mans Rullgard

proresdec: fix decode_slice() prototype

Make the function prototype match the argument of
AVCodecCntext.execute() and remove the cast hiding
this mismatch.
Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 599b4c6e
...@@ -499,8 +499,9 @@ static void decode_slice_plane(ProresContext *ctx, ProresThreadData *td, ...@@ -499,8 +499,9 @@ static void decode_slice_plane(ProresContext *ctx, ProresThreadData *td,
} }
static int decode_slice(AVCodecContext *avctx, ProresThreadData *td) static int decode_slice(AVCodecContext *avctx, void *tdata)
{ {
ProresThreadData *td = tdata;
ProresContext *ctx = avctx->priv_data; ProresContext *ctx = avctx->priv_data;
int mb_x_pos = td->x_pos; int mb_x_pos = td->x_pos;
int mb_y_pos = td->y_pos; int mb_y_pos = td->y_pos;
...@@ -621,7 +622,7 @@ static int decode_picture(ProresContext *ctx, int pic_num, ...@@ -621,7 +622,7 @@ static int decode_picture(ProresContext *ctx, int pic_num,
} }
} }
return avctx->execute(avctx, (void *) decode_slice, return avctx->execute(avctx, decode_slice,
ctx->slice_data, NULL, slice_num, ctx->slice_data, NULL, slice_num,
sizeof(ctx->slice_data[0])); sizeof(ctx->slice_data[0]));
} }
......
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