[FFmpeg-cvslog] avcodec/sbcdec: Remove always-false check

Andreas Rheinhardt git at videolan.org
Wed Oct 5 03:32:21 EEST 2022


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Oct  1 15:31:01 2022 +0200| [23411e6dcd3e610ac59cf6967c89115bcccb8d2e] | committer: Andreas Rheinhardt

avcodec/sbcdec: Remove always-false check

We never guard against a user freeing/stealing the private context;
and returning AVERROR(EIO) is inappropriate.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavcodec/sbcdec.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c
index 3fac2f5016..fd7c2e5e80 100644
--- a/libavcodec/sbcdec.c
+++ b/libavcodec/sbcdec.c
@@ -343,9 +343,6 @@ static int sbc_decode_frame(AVCodecContext *avctx, AVFrame *frame,
     SBCDecContext *sbc = avctx->priv_data;
     int ret, frame_length;
 
-    if (!sbc)
-        return AVERROR(EIO);
-
     frame_length = sbc_unpack_frame(avpkt->data, &sbc->frame, avpkt->size);
     if (frame_length <= 0)
         return frame_length;



More information about the ffmpeg-cvslog mailing list