X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Flpcm.c;h=9ba3ef825c7118420eb5331e64bb959db92322ab;hb=5ccbfaa710c8d86a59e5d07f10e2667ea3619ab0;hp=3fcb8a43ab87838983fbe732b8a4c382d66b3168;hpb=158dc13cc882985fb3c2eac140e86724223b2971;p=fdkaac.git

diff --git a/src/lpcm.c b/src/lpcm.c
index 3fcb8a4..9ba3ef8 100644
--- a/src/lpcm.c
+++ b/src/lpcm.c
@@ -13,8 +13,7 @@
 #include "lpcm.h"
 #include "m4af_endian.h"
 
-#ifdef _MSC_VER
-#  define inline __inline
+#if defined(_MSC_VER) && _MSC_VER < 1800
 #  ifdef _M_IX86
 inline int lrint(double x)
 {
@@ -187,14 +186,14 @@ inline int16_t pcm_f64be_to_s16(int64_t n)
 
 int pcm_convert_to_native_sint16(const pcm_sample_description_t *format,
                                  const void *input, uint32_t nframes,
-                                 int16_t **result, uint32_t *osize)
+                                 int16_t *result)
 {
 #define CONVERT(type, conv) \
     do { \
         unsigned i; \
         type *ip = (type *)input; \
         for (i = 0; i < count; ++i) { \
-            (*result)[i] = conv(ip[i]); \
+            result[i] = conv(ip[i]); \
         } \
     } while(0)
 
@@ -204,7 +203,7 @@ int pcm_convert_to_native_sint16(const pcm_sample_description_t *format,
         uint8_t *ip = (uint8_t *)input; \
         bytes_per_channel = PCM_BYTES_PER_CHANNEL(format); \
         for (i = 0; i < count; ++i) { \
-            (*result)[i] = conv(ip); \
+            result[i] = conv(ip); \
             ip += bytes_per_channel; \
         } \
     } while(0)
@@ -212,11 +211,6 @@ int pcm_convert_to_native_sint16(const pcm_sample_description_t *format,
     uint32_t count = nframes * format->channels_per_frame;
     if (!count)
         return 0;
-    if (!*result || *osize < count) {
-        *osize  = count;
-        *result = realloc(*result, count * sizeof(int16_t));
-    }
-
     switch (PCM_BYTES_PER_CHANNEL(format) | format->sample_type<<4) {
     case 1 | PCM_TYPE_SINT<<4:
         CONVERT(int8_t, pcm_s8_to_s16); break;