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:
2030b3a
31e558f
)
Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 9 Mar 2014 21:15:32 +0000
(22:15 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 9 Mar 2014 21:15:32 +0000
(22:15 +0100)
* commit '
31e558fbcfec8fa9fddf564ab8360384706e41c0
':
isom: add "NO16" FourCC
Conflicts:
libavformat/isom.c
See:
96e25073637f1fdc4818e193e74c38570c390d70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge