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:
b08cd2f
06bede9
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 19 Jun 2013 20:13:29 +0000
(22:13 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 19 Jun 2013 20:13:35 +0000
(22:13 +0200)
* cehoyos/master:
Autodetect idcin only if audio properties allow decoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge