[SCM] libav/experimental: fix duration for ima4

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e0130159809dc6753f630d321ddd1d82409ae351
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Feb 25 11:34:26 2008 +0000

    fix duration for ima4
    
    Originally committed as revision 12197 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 1fcfd88..dede1d6 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -131,6 +131,7 @@ static unsigned int get_aiff_header(ByteIOContext *pb, AVCodecContext *codec,
             break;
         case CODEC_ID_ADPCM_IMA_QT:
             codec->block_align = 34*codec->channels;
+            codec->frame_size = 64;
             break;
         default:
             break;
@@ -390,7 +391,8 @@ got_sound:
 
     av_set_pts_info(st, 64, 1, st->codec->sample_rate);
     st->start_time = 0;
-    st->duration = st->nb_frames;
+    st->duration = st->codec->frame_size ?
+        st->nb_frames * st->codec->frame_size : st->nb_frames;
 
     /* Position the stream at the first block */
     url_fseek(pb, offset, SEEK_SET);

-- 
Libav/FFmpeg packaging