On 08.11.2015 22:04, Andreas Cadhalpun wrote:
> This fixes a SIGFPE crash in the aac_fixed decoder.
>
> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
> ---
> libavcodec/aacsbr_template.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c
> index 66f4159..f69d2f8 100644
> --- a/libavcodec/aacsbr_template.c
> +++ b/libavcodec/aacsbr_template.c
> @@ -718,8 +718,8 @@ static int read_sbr_grid(AACContext *ac,
> SpectralBandReplication *sbr,
> }
>
> for (i = 1; i <= ch_data->bs_num_env; i++) {
> - if (ch_data->t_env[i-1] > ch_data->t_env[i]) {
> - av_log(ac->avctx, AV_LOG_ERROR, "Non monotone time borders\n");
> + if (ch_data->t_env[i-1] >= ch_data->t_env[i]) {
> + av_log(ac->avctx, AV_LOG_ERROR, "Not strictly monotone time
> borders\n");
> return -1;
> }
> }
>
Ping.
Unless there are objections, I'll push this soon, as it fixes crashes.
Best regards,
Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
