Changeset 8b2578ab in ffmpeg

Timestamp:

Nov 22, 2013, 9:57:41 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

564ae836

Parents:

ededb5ff (diff), c453723a (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/22/13 09:56:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/22/13 09:57:41)

Message:

Merge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08'

• commit 'c453723ad7d14abc5e82677eebaa6025fa598f08': gifdec: check that the image dimensions are non-zero

Conflicts:

libavcodec/gifdec.c

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

(No files)