git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dc60061
f1c8413
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 1 Jun 2013 09:49:44 +0000
(11:49 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 1 Jun 2013 09:49:48 +0000
(11:49 +0200)
* cehoyos/master:
Fix compilation with --disable-everything --enable-encoder=jpeg2000
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge