avcodec/nvenc: Fix profile parameter handling

[ffmpeg] / libavcodec / libdcadec.c

diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c
index 6e8926258d19c87f1c609bd9eb571cb96dcf79fe..3ac4bcbe92afb21eb2f522f86cd0a4597042d719 100644 (file)
--- a/libavcodec/libdcadec.c
+++ b/libavcodec/libdcadec.c
@@ -21,7 +21,6 @@
 
 #include <libdcadec/dca_context.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
@@ -80,10 +79,9 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
     avctx->channel_layout = channel_mask;
     avctx->sample_rate    = sample_rate;
 
-    av_assert0(bits_per_sample >= 16);
     if (bits_per_sample == 16)
         avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
-    else if (bits_per_sample <= 24)
+    else if (bits_per_sample > 16 && bits_per_sample <= 24)
         avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
     else {
         av_log(avctx, AV_LOG_ERROR, "Unsupported number of bits per sample: %d\n",