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:
0cc5011
089fac7
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 3 Dec 2013 11:20:44 +0000
(12:20 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 3 Dec 2013 11:20:44 +0000
(12:20 +0100)
* qatar/master:
alsa-audio-dec: explicitly cast the delay to a signed int64
Conflicts:
libavdevice/alsa-audio-dec.c
no change as the buggy code has been replaced in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge