git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4b082bc
fb14730
)
Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Jun 2015 15:21:45 +0000
(17:21 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Jun 2015 15:22:35 +0000
(17:22 +0200)
* commit '
fb1473080223a634b8ac2cca48a632d037a0a69d
':
aac_parser: add required padding for GetBitContext buffer
See:
fccd85b9f30525f88692f53134eba41f1f2d90db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge