Changeset 64e12aec in ffmpeg

Timestamp:

Nov 13, 2014, 10:37:59 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8e6084ee

Parents:

3e1ac103 (diff), 68a3547 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/13/14 10:34:04)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/13/14 10:37:59)

Message:

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>

(No files)