ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Wed Feb 1 02:57:40 2017 +0100| [4bd5d824e927ac22c71186150fda8a8bf4327eed] | committer: Andreas Cadhalpun
boadec: remove log messages Requested-by: Ronald S. Bultje <rsbul...@gmail.com> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bd5d824e927ac22c71186150fda8a8bf4327eed --- libavformat/boadec.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libavformat/boadec.c b/libavformat/boadec.c index 6055eff..730e957 100644 --- a/libavformat/boadec.c +++ b/libavformat/boadec.c @@ -54,19 +54,13 @@ static int read_header(AVFormatContext *s) avio_rl32(s->pb); st->codecpar->sample_rate = avio_rl32(s->pb); st->codecpar->channels = avio_rl32(s->pb); - if (st->codecpar->channels > FF_SANE_NB_CHANNELS) { - av_log(s, AV_LOG_ERROR, "Too many channels %d > %d\n", - st->codecpar->channels, FF_SANE_NB_CHANNELS); + if (st->codecpar->channels > FF_SANE_NB_CHANNELS) return AVERROR(ENOSYS); - } s->internal->data_offset = avio_rl32(s->pb); avio_r8(s->pb); st->codecpar->block_align = avio_rl32(s->pb); - if (st->codecpar->block_align > INT_MAX / FF_SANE_NB_CHANNELS) { - av_log(s, AV_LOG_ERROR, "Too large block alignment %d > %d\n", - st->codecpar->block_align, INT_MAX / FF_SANE_NB_CHANNELS); + if (st->codecpar->block_align > INT_MAX / FF_SANE_NB_CHANNELS) return AVERROR_INVALIDDATA; - } st->codecpar->block_align *= st->codecpar->channels; avio_seek(s->pb, s->internal->data_offset, SEEK_SET); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
