Skip to content
Snippets Groups Projects
Commit 61b9ce00 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '2597a842' 


* commit '2597a842':
  tiff: Improve grayscale support

Conflicts:
	libavcodec/tiff.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 78eaaa85 2597a842
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 11 deletions
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