projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d899ea2
eec7f03
)
Merge commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 23 Nov 2014 00:18:51 +0000
(
01:18
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 23 Nov 2014 00:18:51 +0000
(
01:18
+0100)
* commit '
eec7f032a903e06d249d1e8aa6630b65292bf40f
':
lavf: Remove a redundant include of sys/stat.h
Conflicts:
libavformat/os_support.h
See:
49515cb8407ba237329280d99ab7e79a02560dfe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge