projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6300183
248d8fb
)
Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 24 Oct 2014 10:16:09 +0000
(12:16 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 24 Oct 2014 10:19:35 +0000
(12:19 +0200)
* commit '
248d8fb60c59c8e044d9c8f78f23383b7cdecf72
':
avplay: Use av_gettime_relative
Conflicts:
ffplay.c
See:
0ca0b4c29cf750cbb15732cddbe16723a66afda8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge