Changeset 7dec851 in ffmpeg

Timestamp:

Jul 24, 2013, 10:01:29 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

80063770

Parents:

da0f67b1 (diff), 6fd221e5 (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.

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: 8bps: Make the bound-checks consistent

Conflicts:

libavcodec/8bps.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)