git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b9ffafb
a42d5c8
)
Merge commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 21 Nov 2014 21:25:09 +0000
(22:25 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 21 Nov 2014 21:26:15 +0000
(22:26 +0100)
* commit '
a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b
':
libtwolame: prevent a NULL pointer dereference
See:
a586b3d9b1df9099c18d3e15c9b261f6612ad2ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge