projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4057505
1348420
)
Merge remote-tracking branch 'cus/stable'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 14 Jan 2012 15:40:49 +0000
(16:40 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 14 Jan 2012 15:41:06 +0000
(16:41 +0100)
* cus/stable:
ffplay: silence buffer size must be a multiple of frame size
ffplay: use swr_set_compensation for audio synchronization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge