diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-11-17 09:13:54 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-11-17 09:13:57 -0500 |
| commit | 8d94796cad01141aab56caec4bd0411c172c2069 (patch) | |
| tree | 02e600284df81e1497ddcec37203faf5c3a0c31c | |
| parent | 79e2b1f39b9bb79a64543935e3616bf8abf7dcd8 (diff) | |
| download | libvpx-8d94796cad01141aab56caec4bd0411c172c2069.tar libvpx-8d94796cad01141aab56caec4bd0411c172c2069.tar.gz libvpx-8d94796cad01141aab56caec4bd0411c172c2069.tar.bz2 libvpx-8d94796cad01141aab56caec4bd0411c172c2069.zip | |
vp8mt_alloc_temp_buffers: make prototype return void
This function was never called in a context expecting a return value,
the return value was always a constant, and the !CONFIG_MULTITHREAD
path didn't have a return statement, which caused a compiler warning.
This patch changes the function to return void instead.
Fixes issue #231
Change-Id: I9ef7f56e54418b7265026c54fc4ed5660c1418d1
| -rw-r--r-- | vp8/decoder/decoderthreading.h | 2 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 3 |
2 files changed, 2 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; |