Merge commit '68a35473ed423a14731c418939fba7913647979a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 10:34:04 +0000 (11:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 10:37:59 +0000 (11:37 +0100)
commit64e12aec9654eac8e3054d281b509c6d0212af8b
treed79822c70c453403349c12ad9a085db2504f94d6
parent3e1ac1034535ac19beaa533d7013b9a188363247
parent68a35473ed423a14731c418939fba7913647979a
Merge commit '68a35473ed423a14731c418939fba7913647979a'

* commit '68a35473ed423a14731c418939fba7913647979a':
  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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/4xm.c