Commit 847c0d33 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6ed38b1f'

* commit '6ed38b1f':
  tiff: Return more meaningful error codes

Conflicts:
	libavcodec/tiffenc.c

See: 0187c2ccMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 98263d75 6ed38b1f
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment