Changeset 8617be28 in ffmpeg

Timestamp:

Nov 22, 2013, 11:51:00 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9e22b8a

Parents:

bdf8318 (diff), 430d1219 (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 commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'

• commit '430d12196432ded13f011a3bf7690f03c9b2e5d6': pcx: round up in bits->bytes conversion in a buffer size check

Conflicts:

libavcodec/pcx.c

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

(No files)