diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-11-24 00:05:04 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-11-24 00:05:04 -0500 |
| commit | 394b68c8f8f3d86fd0b30249aa2730317dc2be82 (patch) | |
| tree | b1306fa21d3241c30a2d9bfbbc80c2aa9cfbc804 /vp8 | |
| parent | 8416312095ef85d33148189a5f5d7bd1e4677f6c (diff) | |
| parent | 19e32ac7c7df70d5525d22bda784e5373fb9c705 (diff) | |
| download | libvpx-394b68c8f8f3d86fd0b30249aa2730317dc2be82.tar libvpx-394b68c8f8f3d86fd0b30249aa2730317dc2be82.tar.gz libvpx-394b68c8f8f3d86fd0b30249aa2730317dc2be82.tar.bz2 libvpx-394b68c8f8f3d86fd0b30249aa2730317dc2be82.zip | |
Merge remote branch 'origin/master' into experimental
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/decoder/decoderthreading.h | 2 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 3 | ||||
| -rw-r--r-- | vp8/vp8_cx_iface.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vp8/decoder/decoderthreading.h b/vp8/decoder/decoderthreading.h index 25dee8fe8..60c39d1e1 100644 --- a/vp8/decoder/decoderthreading.h +++ b/vp8/decoder/decoderthreading.h @@ -19,7 +19,7 @@ extern void vp8mt_decode_mb_rows(VP8D_COMP *pbi, MACROBLOCKD *xd); extern void vp8_decoder_remove_threads(VP8D_COMP *pbi); extern void vp8_decoder_create_threads(VP8D_COMP *pbi); -extern int vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows); +extern void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows); extern void vp8mt_de_alloc_temp_buffers(VP8D_COMP *pbi, int mb_rows); #endif diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index fc2fad516..fea4e1cc1 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -596,7 +596,7 @@ void vp8mt_de_alloc_temp_buffers(VP8D_COMP *pbi, int mb_rows) } -int vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows) +void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows) { #if CONFIG_MULTITHREAD VP8_COMMON *const pc = & pbi->common; @@ -647,7 +647,6 @@ int vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows) for (i=0; i< pc->mb_rows; i++) CHECK_MEM_ERROR(pbi->mt_vleft_col[i], vpx_calloc(sizeof(unsigned char) * 8, 1)); } - return 0; #else (void) pbi; (void) width; diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 967fdb5a7..87bdedd14 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -105,6 +105,7 @@ update_error_state(vpx_codec_alg_priv_t *ctx, } +#undef ERROR #define ERROR(str) do {\ ctx->base.err_detail = str;\ return VPX_CODEC_INVALID_PARAM;\ |