Changeset 75b4e401 in ffmpeg

Timestamp:

Apr 13, 2014, 1:30:02 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b9b2f9d2

Parents:

94cf83ff (diff), fdbe18b7 (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:29:23)

git-committer:

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

Message:

Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc'

• commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc': tiffdec: use a single strip if RowsPerStrip is 0

Conflicts:

libavcodec/tiff.c

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

(No files)