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:
92d9341
eae2ebd
)
Merge commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f'
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:17:57 +0000
(14:17 +0100)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:18:02 +0000
(14:18 +0100)
* commit '
eae2ebded3b801ed55d32746b98db88ffe196f4f
':
libxvid: Create extradata in init using a dummy frame
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Trivial merge