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:
8c6f18e
d4a91e6
)
Merge commit 'd4a91e65343be5d79a4afa61c791191e1b57499a'
author
Clément Bœsch
<u@pkh.me>
Wed, 26 Apr 2017 15:32:40 +0000
(17:32 +0200)
committer
Clément Bœsch
<u@pkh.me>
Wed, 26 Apr 2017 15:32:40 +0000
(17:32 +0200)
* commit '
d4a91e65343be5d79a4afa61c791191e1b57499a
':
pthread_frame: do not run hwaccel decoding asynchronously unless it's safe
This commit is a noop, see
e0cd598bc4684654d63942e9ff4872c0b48a7dc2
Merged-by: Clément Bœsch <u@pkh.me>
Trivial merge