Browse Source

pcmdec: move number of channels check to pcm_decode_init()

tags/n0.9
Justin Ruggles 13 years ago
parent
commit
d94e29cac9
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      libavcodec/pcm.c

+ 5
- 5
libavcodec/pcm.c View File

@@ -213,6 +213,11 @@ static av_cold int pcm_decode_init(AVCodecContext * avctx)
PCMDecode *s = avctx->priv_data;
int i;

if (avctx->channels <= 0 || avctx->channels > MAX_CHANNELS) {
av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n");
return AVERROR(EINVAL);
}

switch(avctx->codec->id) {
case CODEC_ID_PCM_ALAW:
for(i=0;i<256;i++)
@@ -266,11 +271,6 @@ static int pcm_decode_frame(AVCodecContext *avctx,
samples = data;
src = buf;

if(avctx->channels <= 0 || avctx->channels > MAX_CHANNELS){
av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n");
return -1;
}

sample_size = av_get_bits_per_sample(avctx->codec_id)/8;

/* av_get_bits_per_sample returns 0 for CODEC_ID_PCM_DVD */


Loading…
Cancel
Save