git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
932d8d7
)
Merge commit 'b99ca863506f0630514921b740b78364de67a3ff'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 24 Nov 2014 11:58:31 +0000
(12:58 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 24 Nov 2014 12:09:35 +0000
(13:09 +0100)
* commit '
b99ca863506f0630514921b740b78364de67a3ff
':
aacdec: avoid an out-of-bounds write
Conflicts:
libavcodec/aacdec.c
See:
ba02069a8e22985a9a775dac9ece6dc54a7e8b44
Merged-by: Michael Niedermayer <michaelni@gmx.at>
No differences found