Changeset 847c0d33 in ffmpeg

Timestamp:

Mar 30, 2015, 6:55:52 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

794e9fb5

Parents:

98263d75 (diff), 6ed38b1f (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> (03/30/15 18:54:08)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/30/15 18:55:52)

Message:

Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'

• commit '6ed38b1f65b424a4fa92042e0069f350b95e0098': tiff: Return more meaningful error codes

Conflicts:

libavcodec/tiffenc.c

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

(No files)