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:
c427b2b
299a568
)
Merge remote-tracking branch 'cigaes/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 20 Feb 2014 15:29:09 +0000
(16:29 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 20 Feb 2014 15:29:15 +0000
(16:29 +0100)
* cigaes/master:
ffmpeg: make reading packets from thread blocking.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge