vble: remove vble_error_close

[ffmpeg] / libavcodec / alac.c

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 85a441abe8f6c104ce743124c5152c427c4a79ab..1056e6c8f43cb03fcade1c77acb8b8f107541c42 100644 (file)
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -368,10 +368,6 @@ static int alac_decode_frame(AVCodecContext *avctx,
     uint8_t interlacing_leftweight;
     int i, ch;
 
-    /* short-circuit null buffers */
-    if (!inbuffer || !input_buffer_size)
-        return -1;
-
     init_get_bits(&alac->gb, inbuffer, input_buffer_size * 8);
 
     channels = get_bits(&alac->gb, 3) + 1;
@@ -548,22 +544,21 @@ static int allocate_buffers(ALACContext *alac)
 {
     int ch;
     for (ch = 0; ch < alac->numchannels; ch++) {
-        alac->predicterror_buffer[ch] =
-            av_malloc(alac->setinfo_max_samples_per_frame * 4);
+        int buf_size = alac->setinfo_max_samples_per_frame * sizeof(int32_t);
 
-        alac->outputsamples_buffer[ch] =
-            av_malloc(alac->setinfo_max_samples_per_frame * 4);
+        FF_ALLOC_OR_GOTO(alac->avctx, alac->predicterror_buffer[ch],
+                         buf_size, buf_alloc_fail);
 
-        alac->extra_bits_buffer[ch] = av_malloc(alac->setinfo_max_samples_per_frame * 4);
+        FF_ALLOC_OR_GOTO(alac->avctx, alac->outputsamples_buffer[ch],
+                         buf_size, buf_alloc_fail);
 
-        if (!alac->predicterror_buffer[ch]  ||
-            !alac->outputsamples_buffer[ch] ||
-            !alac->extra_bits_buffer[ch]) {
-            alac_decode_close(alac->avctx);
-            return AVERROR(ENOMEM);
-        }
+        FF_ALLOC_OR_GOTO(alac->avctx, alac->extra_bits_buffer[ch],
+                         buf_size, buf_alloc_fail);
     }
     return 0;
+buf_alloc_fail:
+    alac_decode_close(alac->avctx);
+    return AVERROR(ENOMEM);
 }
 
 static int alac_set_info(ALACContext *alac)