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:
0f95534
e96175a
)
Merge remote-tracking branch 'cus/stable'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 17 Mar 2013 04:24:35 +0000
(
05:24
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 17 Mar 2013 04:24:41 +0000
(
05:24
+0100)
* cus/stable:
ffplay: add -af option
ffplay: use refcounted frames for audio
ffplay: use frame->pts if available for setting the audio clock
ffplay: restructure audio stream opening code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge