RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instead of discarding data 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-14 21:00:58 +01:00
parent 2545182c29
commit afbe8c6a84
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpegaudiodec_template.c
View File

@ -1953,8 +1953,13 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data,
if (m->nb_channels > 1)
outptr[1] = out_samples[s->coff[fr] + 1];
if ((ret = mp_decode_frame(m, outptr, buf, fsize)) < 0)
return ret;
if ((ret = mp_decode_frame(m, outptr, buf, fsize)) < 0) {
av_log(avctx, AV_LOG_ERROR, "failed to decode channel %d\n", ch);
memset(outptr[0], 0, MPA_FRAME_SIZE*sizeof(OUT_INT));
if (m->nb_channels > 1)
memset(outptr[1], 0, MPA_FRAME_SIZE*sizeof(OUT_INT));
ret = m->nb_channels * MPA_FRAME_SIZE*sizeof(OUT_INT);
}
out_size += ret;
buf += fsize;