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:
bb8ce36
054454c
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 11 Oct 2013 07:20:58 +0000
(09:20 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 11 Oct 2013 07:22:10 +0000
(09:22 +0200)
* qatar/master:
mxf: Add jpeg2000 codec to intra only codecs
See:
c461265a769e9ddadc2e3ee5b759937646fcc839
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge