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:
90c329c
d763978
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 3 Nov 2013 12:07:42 +0000
(13:07 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 3 Nov 2013 12:38:33 +0000
(13:38 +0100)
* qatar/master:
rtmpproto: Reorder conditions to help dead code elimination
See:
23e9e5c7d9048cb463c4de9e518994aa5d651445
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge