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:
23c8a33
3a92ee5
)
Merge remote-tracking branch 'lukaszmluki/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 12 Oct 2013 12:14:48 +0000
(14:14 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 12 Oct 2013 12:14:54 +0000
(14:14 +0200)
* lukaszmluki/master:
avformat/ftp: add log regarding passive mode failure
avformat/ftp: fix possible deadlock
avdevice/pulse_audio_enc: fix stream index
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge