[FFmpeg-cvslog] aiffdec: set block duration for QDM2

Piotr Bandurski git at videolan.org
Tue Jan 1 18:06:08 CET 2013


ffmpeg | branch: master | Piotr Bandurski <ami_stuff at o2.pl> | Tue Jan  1 16:57:01 2013 +0000| [fde13052fb82772396da68d0fdc714464c4b986f] | committer: Paul B Mahol

aiffdec: set block duration for QDM2

Fixes #1697.

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

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

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 79b7853..8d466fa 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -280,8 +280,10 @@ static int aiff_read_header(AVFormatContext *s)
                 return AVERROR(ENOMEM);
             st->codec->extradata_size = size;
             avio_read(pb, st->codec->extradata, size);
-            if (st->codec->codec_id == AV_CODEC_ID_QDM2 && size>=12*4 && !st->codec->block_align)
+            if (st->codec->codec_id == AV_CODEC_ID_QDM2 && size>=12*4 && !st->codec->block_align) {
                 st->codec->block_align = AV_RB32(st->codec->extradata+11*4);
+                aiff->block_duration = AV_RB32(st->codec->extradata+9*4);
+            }
             break;
         case MKTAG('C','H','A','N'):
             if(ff_mov_read_chan(s, pb, st, size) < 0)



More information about the ffmpeg-cvslog mailing list