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:
c6f0687
3297577
)
Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'
author
James Almer
<jamrial@gmail.com>
Fri, 31 Mar 2017 20:08:50 +0000
(17:08 -0300)
committer
James Almer
<jamrial@gmail.com>
Fri, 31 Mar 2017 20:08:50 +0000
(17:08 -0300)
* commit '
3297577f3eac1c87d48dedd527942de2bd28e7a5
':
mpegvideo: Return correct coded frame sizes from parser
This commit is a noop, see
309fe16a126c6c00cc60070de3190cf23f5570fb
Merged-by: James Almer <jamrial@gmail.com>
Trivial merge