git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
28875c4
20c38c9
)
Merge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 12 Apr 2014 23:39:31 +0000
(
01:39
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 12 Apr 2014 23:39:31 +0000
(
01:39
+0200)
* commit '
20c38c9c18b75e62f6c489d9b95bea88efdf3915
':
swscale: fix some undefined signed left shifts
Conflicts:
libswscale/swscale_unscaled.c
See:
7a32ab5ed0b0523d1868da8232ff15831712a18f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge