[FFmpeg-cvslog] avcodec/wmalosslessdec: Replace negative channel check by assert

Michael Niedermayer git at videolan.org
Wed Jan 15 14:52:31 EET 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jan 15 00:46:53 2020 +0100| [9d6be83085ccb1f52b923064eb93566ddbb0a1f7] | committer: Michael Niedermayer

avcodec/wmalosslessdec: Replace negative channel check by assert

It is already checked by common code in git/master

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/wmalosslessdec.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 2b97c2a848..cd7469405d 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -189,11 +189,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
         return AVERROR(EINVAL);
     }
 
-    if (avctx->channels < 0) {
-        av_log(avctx, AV_LOG_ERROR, "invalid number of channels %d\n",
-               avctx->channels);
-        return AVERROR_INVALIDDATA;
-    } else if (avctx->channels > WMALL_MAX_CHANNELS) {
+    av_assert0(avctx->channels >= 0);
+    if (avctx->channels > WMALL_MAX_CHANNELS) {
         avpriv_request_sample(avctx,
                               "More than %d channels", WMALL_MAX_CHANNELS);
         return AVERROR_PATCHWELCOME;



More information about the ffmpeg-cvslog mailing list