git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c824c3c
9a382f3
)
Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'
author
Clément Bœsch
<clement@stupeflix.com>
Tue, 21 Jun 2016 11:21:06 +0000
(13:21 +0200)
committer
Clément Bœsch
<clement@stupeflix.com>
Tue, 21 Jun 2016 11:21:06 +0000
(13:21 +0200)
* commit '
9a382f363950c0aab1500aa0937f73bf4dde9ee3
':
mmaldec: add vc1 decoding support
This commit is a noop, see
b07cbf6724207ba768ebb2ccdee1b6749fd6ca31
Merged-by: Clément Bœsch <clement@stupeflix.com>
Trivial merge