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:
4039076
e344e65
)
Merge commit 'e344e65109f1a75ca82aff4cecec44e79197753c'
author
Clément Bœsch
<cboesch@gopro.com>
Tue, 31 Jan 2017 16:26:26 +0000
(17:26 +0100)
committer
Clément Bœsch
<cboesch@gopro.com>
Tue, 31 Jan 2017 16:26:26 +0000
(17:26 +0100)
* commit '
e344e65109f1a75ca82aff4cecec44e79197753c
':
h264dec: do not call finish_setup() if we have not started a frame
This commit is a noop, see
bdbbb8f11edbf10add874508c5125c174d8939be
Merged-by: Clément Bœsch <cboesch@gopro.com>
Trivial merge