[FFmpeg-cvslog] lavf/au: check bits per coded sample.

Nicolas George git at videolan.org
Sat Aug 18 18:03:15 CEST 2012


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sat Aug 18 14:12:41 2012 +0200| [92b8c9d89e7ae86bffa05393bb230d5a165b0148] | committer: Nicolas George

lavf/au: check bits per coded sample.

Without that, it would repeatedly produce empty packets
if the codec if forced to something invalid.

Fix trac ticket #1652.

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

 libavformat/au.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/au.c b/libavformat/au.c
index b7654a4..788e261 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -181,10 +181,13 @@ static int au_read_packet(AVFormatContext *s,
                           AVPacket *pkt)
 {
     int ret;
+    int bpcs = av_get_bits_per_sample(s->streams[0]->codec->codec_id);
 
+    if (!bpcs)
+        return AVERROR(EINVAL);
     ret= av_get_packet(s->pb, pkt, BLOCK_SIZE *
                        s->streams[0]->codec->channels *
-                       av_get_bits_per_sample(s->streams[0]->codec->codec_id) >> 3);
+                       bpcs >> 3);
     if (ret < 0)
         return ret;
     pkt->flags &= ~AV_PKT_FLAG_CORRUPT;



More information about the ffmpeg-cvslog mailing list