Browse Source

avcodec/libdcadec: remove av_assert and check bits_per_sample more completely

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.7
Michael Niedermayer 10 years ago
parent
commit
fda8b7ec7d
1 changed files with 1 additions and 3 deletions
  1. +1
    -3
      libavcodec/libdcadec.c

+ 1
- 3
libavcodec/libdcadec.c View File

@@ -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",


Loading…
Cancel
Save