Changeset 94cf83ff in ffmpeg

Timestamp:

Apr 13, 2014, 1:20:09 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

75b4e401

Parents:

31876ea6 (diff), 0a467a9b (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> (04/13/14 01:01:03)

git-committer:

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

Message:

Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'

• commit '0a467a9b594dd67aa96bad687d05f8845b009f18': tiffdec: use bytestream2 to simplify overread/overwrite protection

Conflicts:

libavcodec/tiff.c

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

(No files)