[FFmpeg-cvslog] proresdec: fix decode_slice() prototype

Mans Rullgard git at videolan.org
Tue Dec 13 00:59:43 CET 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Dec 11 23:36:05 2011 +0000| [179ae53fed874419951c3cc0f789ccecc980d641] | committer: 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: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=179ae53fed874419951c3cc0f789ccecc980d641
---

 libavcodec/proresdec.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index 46434df..adadcf8 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]));
 }



More information about the ffmpeg-cvslog mailing list