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:
3130e5b
da7e561
)
Merge commit 'da7e561964ee833678dc24fae0b0265358126d1e'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 25 Feb 2015 00:05:10 +0000
(
01:05
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 25 Feb 2015 00:09:00 +0000
(
01:09
+0100)
* commit '
da7e561964ee833678dc24fae0b0265358126d1e
':
matroskaenc: Allow writing track "forced" flag
See:
d88d0b6db6bd77269e3c2d3b4894c072f3860671
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge