Changeset e86cd37a in ffmpeg

Timestamp:

Jan 6, 2014, 1:43:04 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b7697d29

Parents:

80d44190 (diff), f4a8a008 (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> (01/06/14 13:40:26)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/06/14 13:43:04)

Message:

Merge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'

• commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b': sgidec: fix buffer size check in expand_rle_row()

Conflicts:

libavcodec/sgidec.c

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

(No files)