[FFmpeg-devel] [PATCH] aacsbr: break infinite loop in sbr_hf_calc_npatches

[Andreas Cadhalpun]

On 22.04.2015 17:35, Claudio Freire wrote:
> On Wed, Apr 22, 2015 at 10:23 AM, Andreas Cadhalpun
> <andreas.cadhalpun at googlemail.com> wrote:
>> +        if (k == last_k && msb == last_msb) {
>> +            av_log(ac->avctx, AV_LOG_ERROR, "patch construction failed\n");
>> +            return AVERROR_INVALIDDATA;
>> +        }
>> +        last_k = k;
>> +        last_msb = msb;
> 
> 
> I don't think the INVALIDDATA return will have the desired effect.
> 
> I think you want return -1;

This function is only called once and there the check is:
    if (sbr_hf_calc_npatches(ac, sbr) < 0)
        return -1;

Thus returning AVERROR_INVALIDDATA works as well as -1.

Best regards,
Andreas