[FFmpeg-cvslog] r20674 - in trunk/libavformat: aiff.h aiffdec.c

[Måns Rullgård]

bcoudurier <subversion at mplayerhq.hu> writes:

> Author: bcoudurier
> Date: Mon Nov 30 23:01:21 2009
> New Revision: 20674
>
> Log:
> decode qcelp in aiff, implement #1524, patch by Vitor
>
> @@ -292,8 +296,12 @@ static int aiff_read_packet(AVFormatCont
>          return AVERROR_EOF;
>
>      /* Now for that packet */
> -    max_size = FFMIN(max_size, (MAX_SIZE / st->codec->block_align) * st->codec->block_align);
> -    res = av_get_packet(s->pb, pkt, max_size);
> +    if (st->codec->block_align >= 33) // GSM, QCLP, IMA4
> +        size = st->codec->block_align;
> +    else
> +        size = (MAX_SIZE / st->codec->block_align) * st->codec->block_align;
> +    size = FFMIN(max_size, size);
> +    res = av_get_packet(s->pb, pkt, size);
>      if (res < 0)
>          return res;

This broke seektest.  Please check.

-- 
M?ns Rullg?rd
mans at mansr.com