OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba94e98
504e3f7
)
Merge commit '504e3f75bf73a488d39a80a42962bae2a353dd6b'
author
Hendrik Leppkes
<h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:03:49 +0000
(23:03 +0200)
committer
Hendrik Leppkes
<h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:03:49 +0000
(23:03 +0200)
* commit '
504e3f75bf73a488d39a80a42962bae2a353dd6b
':
aac: Make codec init run under ff_thread_once
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Trivial merge