• Michael Niedermayer's avatar
    Merge commit '68a35473' · 64e12aec
    Michael Niedermayer authored
    * commit '68a35473':
      4xm: more thorought check for negative index and negative shift
    
    Conflicts:
    	libavcodec/4xm.c
    
    Mostly not merged, the added checks, check for impossible conditions
    for paranoias sake they are replaced by asserts but thats probably overkill
    the vlc table does not contain out of range values or holes,
    nor does it permit the log2 values to become negative. Whenever a
    log2 value reaches 0 the selected table no longer contains an entry to trigger
    the case that would decrease it further
    
    Adding such impossible checks would confuse the reader
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    64e12aec
4xm.c 33.6 KB