[FFmpeg-cvslog] alac: use sizeof() instead of hardcoded data sizes

Justin Ruggles git at videolan.org
Thu Jul 19 23:35:51 CEST 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Mon Jul  9 11:04:56 2012 -0400| [4bcd637dcbae78ab419d61164e80438f5925030d] | committer: Justin Ruggles

alac: use sizeof() instead of hardcoded data sizes

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

 libavcodec/alac.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 91c94d7..483346c 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -142,7 +142,8 @@ static void bastardized_rice_decompress(ALACContext *alac,
                     av_log(alac->avctx, AV_LOG_ERROR, "invalid zero block size of %d %d %d\n", block_size, output_size, output_count);
                     block_size= output_size - output_count - 1;
                 }
-                memset(&output_buffer[output_count+1], 0, block_size * 4);
+                memset(&output_buffer[output_count + 1], 0,
+                       block_size * sizeof(*output_buffer));
                 output_count += block_size;
             }
 
@@ -176,7 +177,8 @@ static void predictor_decompress_fir_adapt(int32_t *error_buffer,
         if (output_size <= 1)
             return;
 
-        memcpy(buffer_out+1, error_buffer+1, (output_size-1) * 4);
+        memcpy(&buffer_out[1], &error_buffer[1],
+               (output_size - 1) * sizeof(*buffer_out));
         return;
     }
 



More information about the ffmpeg-cvslog mailing list