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:
fd84b6f
9375879
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 25 Jul 2013 20:50:46 +0000
(22:50 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 25 Jul 2013 20:50:51 +0000
(22:50 +0200)
* cehoyos/master:
Show max bitrate for mpeg2 video streams in avcodec_string().
Allow native compilation on the iPhone.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge