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:
13b77e0
b3051a4
)
Merge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:07:39 +0000
(23:07 +0100)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:07:55 +0000
(23:07 +0100)
This commit is a no-op. We cherry picked it earlier.
* commit '
b3051a460cf02a5b86ff0d1e14abba23ea55ff6d
':
vaapi_h264: Fix bit offset of slice data.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Trivial merge