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:
d98aa7c
981cf0c
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 3 Mar 2013 13:04:48 +0000
(14:04 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 3 Mar 2013 13:05:09 +0000
(14:05 +0100)
* cehoyos/master:
movenc: Do not flag secondary audio and subtitle tracks as enabled.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge