git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6145b1d
58bc38a
)
Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Apr 2014 00:01:10 +0000
(
02:01
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 13 Apr 2014 00:01:31 +0000
(
02:01
+0200)
* commit '
58bc38a5f224d29b79338200459792c765c25fd5
':
tiffdec: use correct data type for palette entries and set alpha to 0xFF
Conflicts:
libavcodec/tiff.c
See:
dbfdb288c1921eeb9fef5bca20eee33da7fcdd71
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge