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:
fe540ae
30be1ea
)
Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Nov 2013 11:02:50 +0000
(12:02 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Nov 2013 11:07:53 +0000
(12:07 +0100)
* commit '
30be1ea33e5525266ad871bed60b1893a53caeaf
':
matroskadec: pad EBML_BIN data.
Conflicts:
libavformat/matroskadec.c
See:
c63e76ba3553d7635b92ac3801f3087e85a76bfb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge