avidec: avoid infinite loop due to negative ast->sample_size
authorAndreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Mon, 4 May 2015 21:01:45 +0000 (23:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 00:13:11 +0000 (02:13 +0200)
commit4d27d864a653c47b76da2ad994799e994720dbf6
tree83cca49705756755abe0ab05bd710249530223c4
parent35eabb85b2a68ea5620c5cbd21fb478291bc7b51
avidec: avoid infinite loop due to negative ast->sample_size

If max in clean_index is set to a negative ast->sample_size, the
following loop never ends:
        while (max < 1024)
            max += max;

Thus set ast->sample_size to 0 if it would otherwise be negative.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ca234639ac49a0dc073ac1f10977979acdb94f97)

Conflicts:

libavformat/avidec.c
libavformat/avidec.c