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:
b329460
2e09359
)
Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 2 Dec 2014 21:55:14 +0000
(22:55 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 2 Dec 2014 21:56:07 +0000
(22:56 +0100)
* commit '
2e0935965b824bc641b7e0bafafcbb1e36027f79
':
Drop the unofficial extension prefix for MPEG and MPEG-TS formats
See:
fdcb2873e1c898cf26216f7e80d95d03387ba55b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge