diff mbox series

[FFmpeg-devel,08/16] avcodec/roqaudioenc: Avoid redundant free of unallocated buffer

Message ID 20200913025753.274772-8-andreas.rheinhardt@gmail.com
State Accepted
Commit 0b45ac571713cc8fda7aa5381c68ad671d21504b
Headers show
Series [FFmpeg-devel,01/16] avcodec/snowdec: Use ff_snow_common_init() directly
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 13, 2020, 2:57 a.m. UTC
If allocating a buffer in RoQ DPCM encoder's init function failed,
the close function would be called manually; all this function does is
freeing said buffer, but given that it has not been allocated at all,
this is unnecessary.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/roqaudioenc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c
index 5154604be8..c09212d3d1 100644
--- a/libavcodec/roqaudioenc.c
+++ b/libavcodec/roqaudioenc.c
@@ -53,7 +53,6 @@  static av_cold int roq_dpcm_encode_close(AVCodecContext *avctx)
 static av_cold int roq_dpcm_encode_init(AVCodecContext *avctx)
 {
     ROQDPCMContext *context = avctx->priv_data;
-    int ret;
 
     if (avctx->channels > 2) {
         av_log(avctx, AV_LOG_ERROR, "Audio must be mono or stereo\n");
@@ -70,17 +69,12 @@  static av_cold int roq_dpcm_encode_init(AVCodecContext *avctx)
 
     context->frame_buffer = av_malloc(8 * ROQ_FRAME_SIZE * avctx->channels *
                                       sizeof(*context->frame_buffer));
-    if (!context->frame_buffer) {
-        ret = AVERROR(ENOMEM);
-        goto error;
-    }
+    if (!context->frame_buffer)
+        return AVERROR(ENOMEM);
 
     context->lastSample[0] = context->lastSample[1] = 0;
 
     return 0;
-error:
-    roq_dpcm_encode_close(avctx);
-    return ret;
 }
 
 static unsigned char dpcm_predict(short *previous, short current)