summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorRoman Shaposhnik <roman@shaposhnik.org>2008-11-12 17:47:23 +0000
committerRoman Shaposhnik <roman@shaposhnik.org>2008-11-12 17:47:23 +0000
commit3a84713aaa5a0f83cbb3fdca62c83df609822c9c (patch)
treefb2e3a6047cc289f35bcb451bd82e85e5b2a18f1 /libavcodec/h264.c
parent52ece4105788c533625600b887e6bc762a97508d (diff)
Making it easier to send arbitrary structures as work orders to MT workers
Originally committed as revision 15804 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e501cb5ce9..426a3b8639 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6626,7 +6626,8 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8
}
}
-static int decode_slice(struct AVCodecContext *avctx, H264Context *h){
+static int decode_slice(struct AVCodecContext *avctx, void *arg){
+ H264Context *h = *(void**)arg;
MpegEncContext * const s = &h->s;
const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
@@ -7346,7 +7347,7 @@ static void execute_decode_slices(H264Context *h, int context_count){
}
avctx->execute(avctx, (void *)decode_slice,
- (void **)h->thread_context, NULL, context_count);
+ (void **)h->thread_context, NULL, context_count, sizeof(void*));
/* pull back stuff from slices to master context */
hx = h->thread_context[context_count - 1];