diff options
-rw-r--r-- | apps/plugins/mpegplayer/video_out_rockbox.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/flac.c | 16 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/modes_wb.c | 13 | ||||
-rw-r--r-- | lib/rbcodec/codecs/mod.c | 2 |
4 files changed, 15 insertions, 18 deletions
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c index ee5c3400c5..331383843b 100644 --- a/apps/plugins/mpegplayer/video_out_rockbox.c +++ b/apps/plugins/mpegplayer/video_out_rockbox.c | |||
@@ -369,7 +369,7 @@ void stretch_image_plane(const uint8_t * src, uint8_t *dst, int stride, | |||
369 | bool vo_draw_frame_thumb(uint8_t * const * buf, const struct vo_rect *rc) | 369 | bool vo_draw_frame_thumb(uint8_t * const * buf, const struct vo_rect *rc) |
370 | { | 370 | { |
371 | void *mem; | 371 | void *mem; |
372 | size_t bufsize; | 372 | size_t bufsize = 0; |
373 | uint8_t *yuv[3]; | 373 | uint8_t *yuv[3]; |
374 | struct vo_rect thumb_rc; | 374 | struct vo_rect thumb_rc; |
375 | int thumb_width, thumb_height; | 375 | int thumb_width, thumb_height; |
diff --git a/lib/rbcodec/codecs/flac.c b/lib/rbcodec/codecs/flac.c index 753115dc30..a460ea2625 100644 --- a/lib/rbcodec/codecs/flac.c +++ b/lib/rbcodec/codecs/flac.c | |||
@@ -91,15 +91,15 @@ static bool flac_init(FLACContext* fc, int first_frame_offset) | |||
91 | nseekpoints=0; | 91 | nseekpoints=0; |
92 | 92 | ||
93 | fc->sample_skip = 0; | 93 | fc->sample_skip = 0; |
94 | 94 | ||
95 | /* Reset sample buffers */ | 95 | /* Reset sample buffers */ |
96 | memset(decoded0, 0, sizeof(decoded0)); | 96 | ci->memset(decoded0, 0, sizeof(decoded0)); |
97 | memset(decoded1, 0, sizeof(decoded1)); | 97 | ci->memset(decoded1, 0, sizeof(decoded1)); |
98 | memset(decoded2, 0, sizeof(decoded2)); | 98 | ci->memset(decoded2, 0, sizeof(decoded2)); |
99 | memset(decoded3, 0, sizeof(decoded3)); | 99 | ci->memset(decoded3, 0, sizeof(decoded3)); |
100 | memset(decoded4, 0, sizeof(decoded4)); | 100 | ci->memset(decoded4, 0, sizeof(decoded4)); |
101 | memset(decoded5, 0, sizeof(decoded5)); | 101 | ci->memset(decoded5, 0, sizeof(decoded5)); |
102 | 102 | ||
103 | /* Set sample buffers in decoder structure */ | 103 | /* Set sample buffers in decoder structure */ |
104 | fc->decoded[0] = decoded0; | 104 | fc->decoded[0] = decoded0; |
105 | fc->decoded[1] = decoded1; | 105 | fc->decoded[1] = decoded1; |
diff --git a/lib/rbcodec/codecs/libspeex/modes_wb.c b/lib/rbcodec/codecs/libspeex/modes_wb.c index 4055a2b074..5438551c1b 100644 --- a/lib/rbcodec/codecs/libspeex/modes_wb.c +++ b/lib/rbcodec/codecs/libspeex/modes_wb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* Copyright (C) 2002-2007 Jean-Marc Valin | 1 | /* Copyright (C) 2002-2007 Jean-Marc Valin |
2 | File: modes.c | 2 | File: modes.c |
3 | 3 | ||
4 | Describes the wideband modes of the codec | 4 | Describes the wideband modes of the codec |
@@ -6,18 +6,18 @@ | |||
6 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions | 7 | modification, are permitted provided that the following conditions |
8 | are met: | 8 | are met: |
9 | 9 | ||
10 | - Redistributions of source code must retain the above copyright | 10 | - Redistributions of source code must retain the above copyright |
11 | notice, this list of conditions and the following disclaimer. | 11 | notice, this list of conditions and the following disclaimer. |
12 | 12 | ||
13 | - Redistributions in binary form must reproduce the above copyright | 13 | - Redistributions in binary form must reproduce the above copyright |
14 | notice, this list of conditions and the following disclaimer in the | 14 | notice, this list of conditions and the following disclaimer in the |
15 | documentation and/or other materials provided with the distribution. | 15 | documentation and/or other materials provided with the distribution. |
16 | 16 | ||
17 | - Neither the name of the Xiph.org Foundation nor the names of its | 17 | - Neither the name of the Xiph.org Foundation nor the names of its |
18 | contributors may be used to endorse or promote products derived from | 18 | contributors may be used to endorse or promote products derived from |
19 | this software without specific prior written permission. | 19 | this software without specific prior written permission. |
20 | 20 | ||
21 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 21 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
22 | ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 22 | ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
23 | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 23 | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
@@ -371,6 +371,3 @@ const SpeexMode * speex_lib_get_mode (int mode) | |||
371 | 371 | ||
372 | return speex_mode_list[mode]; | 372 | return speex_mode_list[mode]; |
373 | } | 373 | } |
374 | |||
375 | |||
376 | |||
diff --git a/lib/rbcodec/codecs/mod.c b/lib/rbcodec/codecs/mod.c index d0d7e1d996..ef1db5dea9 100644 --- a/lib/rbcodec/codecs/mod.c +++ b/lib/rbcodec/codecs/mod.c | |||
@@ -424,7 +424,7 @@ void initmodplayer(void) | |||
424 | /* Set Default Panning */ | 424 | /* Set Default Panning */ |
425 | mixer_setpanning(c, panningvalues[c]); | 425 | mixer_setpanning(c, panningvalues[c]); |
426 | /* Reset channels in the MOD Player */ | 426 | /* Reset channels in the MOD Player */ |
427 | memset(&modplayer.modchannel[c], 0, sizeof(struct s_modchannel)); | 427 | ci->memset(&modplayer.modchannel[c], 0, sizeof(struct s_modchannel)); |
428 | /* Don't play anything */ | 428 | /* Don't play anything */ |
429 | mixer.channel[c].channelactive = false; | 429 | mixer.channel[c].channelactive = false; |
430 | } | 430 | } |