[FFmpeg-cvslog] wavdec: make sample count check more precise

Ganesh Ajjanagadde git at videolan.org
Wed Jul 29 13:27:34 CEST 2015


ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde at gmail.com> | Wed Jul 29 00:28:15 2015 -0400| [13d605e090bd408a1040624f7173bcc142f81410] | committer: Michael Niedermayer

wavdec: make sample count check more precise

May be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13d605e090bd408a1040624f7173bcc142f81410
---

 libavformat/wavdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 9bc8c4f..db42f59 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -430,7 +430,7 @@ break_loop:
     avio_seek(pb, data_ofs, SEEK_SET);
 
     if (   data_size > 0 && sample_count && st->codec->channels
-        && data_size / sample_count / st->codec->channels > 8) {
+        && (data_size << 3) / sample_count / st->codec->channels > st->codec->bits_per_coded_sample) {
         av_log(s, AV_LOG_WARNING, "ignoring wrong sample_count %"PRId64"\n", sample_count);
         sample_count = 0;
     }



More information about the ffmpeg-cvslog mailing list