diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-12-11 23:36:05 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-12-12 00:02:47 +0000 |
| commit | 179ae53fed874419951c3cc0f789ccecc980d641 (patch) | |
| tree | 5ecb09068fc76688868a18226bbb44f9ff44d8bb /libavcodec/proresdec.c | |
| parent | 599b4c6efddaed33b1667c386b34b07729ba732b (diff) | |
| download | ffmpeg-179ae53fed874419951c3cc0f789ccecc980d641.tar.gz | |
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: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/proresdec.c')
| -rw-r--r-- | libavcodec/proresdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c index 46434df263..adadcf8b75 100644 --- a/libavcodec/proresdec.c +++ b/libavcodec/proresdec.c @@ -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; int mb_x_pos = td->x_pos; int mb_y_pos = td->y_pos; @@ -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, sizeof(ctx->slice_data[0])); } |