git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5eb23e6
95a57d2
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 3 Jul 2013 14:42:20 +0000
(16:42 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 3 Jul 2013 14:42:33 +0000
(16:42 +0200)
* qatar/master:
jpeg2000: Use the matching coding style struct for transform selection
jpeg2000: Merge rescaling with interleaving in 9/7 IDWT
No change, all commits & hunks where already in.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge