ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu Aug 13 12:14:53 2015 +0200| [acbd78a001e137d37139295ae68753886cea0a04] | committer: Michael Niedermayer
avformat/wavdec: Detect wrongly interpreted specification about the sample value in the fact chunk Fixes Ticket703 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acbd78a001e137d37139295ae68753886cea0a04 --- libavformat/wavdec.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 85e7da6..666fa31 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -434,6 +434,15 @@ break_loop: data_size = 0; } + if ( st->codec->bit_rate > 0 && data_size > 0 + && st->codec->sample_rate > 0 + && sample_count > 0 && st->codec->channels > 1 + && sample_count % st->codec->channels == 0) { + if (fabs(8.0 * data_size * st->codec->channels * st->codec->sample_rate / + sample_count /st->codec->bit_rate - 1.0) < 0.3) + sample_count /= st->codec->channels; + } + if ( data_size > 0 && sample_count && st->codec->channels && (data_size << 3) / sample_count / st->codec->channels > st->codec->bits_per_coded_sample + 1) { av_log(s, AV_LOG_WARNING, "ignoring wrong sample_count %"PRId64"\n", sample_count); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
