projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
64539e1
44f7df0
)
Merge commit '44f7df0c987965763c609f6dc36974b04182e58d'
author
Michael Niedermayer
<michael@niedermayer.cc>
Thu, 23 Jul 2015 19:30:28 +0000
(21:30 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Thu, 23 Jul 2015 19:30:28 +0000
(21:30 +0200)
* commit '
44f7df0c987965763c609f6dc36974b04182e58d
':
dds: Write the palette in the native endian form
Conflicts:
libavcodec/dds.c
See:
36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Trivial merge